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

6499673: Assertion check for TypeVariable.getUpperBound() fails

Browse source 
Fix TypeVariable.getUpperBound to return results as specified

Reviewed-by: jjg
This commit is contained in:
Eric McCorkle 2013-09-23 15:37:59 -04:00
parent e815841576
commit c101eca6bb
7 changed files with 363 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javac/code/Type.java
View file

@ -977,7 +977,7 @@ public abstract class Type implements TypeMirror {
}
public java.util.List<? extends TypeMirror> getBounds() {
return Collections.unmodifiableList(getComponents());
return Collections.unmodifiableList(getExplicitComponents());
}
public List<Type> getComponents() {

23
langtools/src/share/classes/com/sun/tools/javac/code/Types.java
View file

@ -2414,6 +2414,29 @@ public class Types {
}
};
public List<Type> directSupertypes(Type t) {
return directSupertypes.visit(t);
}
// where
private final UnaryVisitor<List<Type>> directSupertypes = new UnaryVisitor<List<Type>>() {
public List<Type> visitType(final Type type, final Void ignored) {
if (!type.isCompound()) {
final Type sup = supertype(type);
return (sup == Type.noType || sup == type || sup == null)
? interfaces(type)
: interfaces(type).prepend(sup);
} else {
return visitIntersectionType((IntersectionClassType) type);
}
}
private List<Type> visitIntersectionType(final IntersectionClassType it) {
return it.getExplicitComponents();
}
};
public boolean isDirectSuperInterface(TypeSymbol isym, TypeSymbol origin) {
for (Type i2 : interfaces(origin.type)) {
if (isym == i2.tsym) return true;

6
langtools/src/share/classes/com/sun/tools/javac/model/JavacTypes.java
View file

@ -116,11 +116,7 @@ public class JavacTypes implements javax.lang.model.util.Types {
public List<Type> directSupertypes(TypeMirror t) {
validateTypeNotIn(t, EXEC_OR_PKG);
Type type = (Type) t;
Type sup = types.supertype(type);
return (sup == Type.noType || sup == type || sup == null)
? types.interfaces(type)
: types.interfaces(type).prepend(sup);
return types.directSupertypes((Type) t);
}
public TypeMirror erasure(TypeMirror t) {

4
langtools/test/tools/javac/cast/intersection/model/Model01.java
View file

@ -23,7 +23,7 @@
/*
* @test
* @bug 8002099
* @bug 8002099 6499673
* @summary Add support for intersection types in cast expression
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor ModelChecker
@ -46,7 +46,7 @@ class Test {
}
void test(){
@IntersectionTypeInfo({"java.lang.Object", "Test.A", "Test.B"})
@IntersectionTypeInfo({"Test.A", "Test.B"})
Object o = (A & B)null;
}
}

2
langtools/test/tools/javac/cast/intersection/model/ModelChecker.java
View file

@ -97,7 +97,7 @@ public class ModelChecker extends JavacTestingAbstractProcessor {
}
}
assertTrue(assertionCount == 10, "Expected 10 assertions - found " + assertionCount);
assertTrue(assertionCount == 9, "Expected 9 assertions - found " + assertionCount);
return super.visitVariable(node, p);
}
}

200
langtools/test/tools/javac/processing/model/type/BoundsTest.java Normal file
View file

@ -0,0 +1,200 @@
/*
* Copyright (c) 2012, 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 6499673
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor BoundsTest
* @run main BoundsTest
* @summary Assertion check for TypeVariable.getUpperBound() fails
*/
import com.sun.source.util.*;
import com.sun.tools.javac.api.*;
import com.sun.tools.javac.file.*;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.element.*;
import javax.tools.*;
import java.util.*;
import java.io.*;
public class BoundsTest {
private int errors = 0;
private static final String Intersection_name = "IntersectionTest.java";
private static final String Intersection_contents =
"import java.util.List;\n" +
"import java.io.Serializable;\t" +
"public class IntersectionTest<S extends List & Serializable> {\n" +
" void method(S s) { }\n" +
"}";
private static final String[] Intersection_bounds = {
"java.util.List",
"java.io.Serializable"
};
private static final String[] Intersection_supers = {
"java.util.List",
"java.io.Serializable"
};
private static final String Single_name = "SingleTest.java";
private static final String Single_contents =
"import java.util.List;\n" +
"public class SingleTest<S extends List> {\n" +
" void method(S s) { }\n" +
"}";
private static final String[] Single_bounds = {
"java.util.List",
};
private static final String[] Single_supers = {
"java.lang.Object",
"java.util.Collection"
};
private static final String NoBounds_name = "NoBoundsTest.java";
private static final String NoBounds_contents =
"public class NoBoundsTest<S> {\n" +
" void method(S s) { }\n" +
"}";
private static final String[] NoBounds_bounds = {
"java.lang.Object",
};
private static final String[] NoBounds_supers = {};
private HashSet<CharSequence> expected_bounds;
private HashSet<CharSequence> expected_supers;
private static final File classesdir = new File("intersectionproperties");
private static final JavaCompiler comp =
ToolProvider.getSystemJavaCompiler();
private static final StandardJavaFileManager fm =
comp.getStandardFileManager(null, null, null);
public void runOne(final String Test_name, final String Test_contents,
final String[] Test_bounds, final String[] Test_supers)
throws IOException {
System.err.println("Testing " + Test_name);
expected_bounds = new HashSet<CharSequence>(Arrays.asList(Test_bounds));
expected_supers = new HashSet<CharSequence>(Arrays.asList(Test_supers));
final Iterable<? extends JavaFileObject> files =
fm.getJavaFileObjectsFromFiles(Collections.singleton(writeFile(classesdir, Test_name, Test_contents)));
final JavacTask ct =
(JavacTask)comp.getTask(null, fm, null, null, null, files);
ct.setProcessors(Collections.singleton(new TestProcessor()));
if (!ct.call()) {
System.err.println("Compilation unexpectedly failed");
errors++;
}
}
public void run() throws IOException {
runOne(Intersection_name, Intersection_contents,
Intersection_bounds, Intersection_supers);
runOne(Single_name, Single_contents,
Single_bounds, Single_supers);
runOne(NoBounds_name, NoBounds_contents,
NoBounds_bounds, NoBounds_supers);
if (0 != errors)
throw new RuntimeException(errors + " errors occurred");
}
public static void main(String... args) throws IOException {
new IntersectionPropertiesTest().run();
}
private static File writeFile(File dir, String path, String body)
throws IOException {
File f = new File(dir, path);
f.getParentFile().mkdirs();
try (FileWriter out = new FileWriter(f)) {
out.write(body);
}
return f;
}
private class TestProcessor extends JavacTestingAbstractProcessor {
private Set<? extends Element> rootElements;
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
rootElements = roundEnv.getRootElements();
if (!rootElements.isEmpty()) {
performCheck();
}
return true;
}
private void performCheck() {
TypeElement typeElement = (TypeElement) rootElements.iterator().next();
ExecutableElement method = ElementFilter.methodsIn(typeElement.getEnclosedElements()).get(0);
TypeVariable typeVariable = (TypeVariable) method.getParameters().get(0).asType();
final TypeMirror upperBound = typeVariable.getUpperBound();
TypeParameterElement typeParameterElement = ((TypeParameterElement) typeVariable.asElement());
final List<? extends TypeMirror> bounds = typeParameterElement.getBounds();
final List<? extends TypeMirror> supers = processingEnv.getTypeUtils().directSupertypes(upperBound);
final HashSet<CharSequence> actual_bounds = new HashSet<CharSequence>();
final HashSet<CharSequence> actual_supers = new HashSet<CharSequence>();
for(TypeMirror ty : bounds) {
actual_bounds.add(((TypeElement)((DeclaredType)ty).asElement()).getQualifiedName());
}
for(TypeMirror ty : supers) {
actual_supers.add(((TypeElement)((DeclaredType)ty).asElement()).getQualifiedName());
}
if (!expected_bounds.equals(actual_bounds)) {
System.err.println("Mismatched expected and actual bounds.");
System.err.println("Expected:");
for(CharSequence tm : expected_bounds)
System.err.println(" " + tm);
System.err.println("Actual:");
for(CharSequence tm : actual_bounds)
System.err.println(" " + tm);
errors++;
}
if (!expected_supers.equals(actual_supers)) {
System.err.println("Mismatched expected and actual bounds.");
System.err.println("Expected:");
for(CharSequence tm : expected_supers)
System.err.println(" " + tm);
System.err.println("Actual:");
for(CharSequence tm : actual_supers)
System.err.println(" " + tm);
errors++;
}
}
}
}

135
langtools/test/tools/javac/processing/model/type/IntersectionPropertiesTest.java Normal file
View file

@ -0,0 +1,135 @@
/*
* Copyright (c) 2012, 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 6499673
* @library /tools/javac/lib
* @build JavacTestingAbstractProcessor IntersectionPropertiesTest
* @run main IntersectionPropertiesTest
* @summary Assertion check for TypeVariable.getUpperBound() fails
*/
import com.sun.source.util.*;
import com.sun.tools.javac.api.*;
import com.sun.tools.javac.file.*;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.type.*;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.element.*;
import javax.tools.*;
import java.util.*;
import java.io.*;
public class IntersectionPropertiesTest {
private int errors = 0;
private static final String Intersection_name = "IntersectionTest.java";
private static final String Intersection_contents =
"import java.util.List;\n" +
"import java.io.Serializable;\t" +
"public class IntersectionTest<S extends List & Serializable> {\n" +
" void method(S s) { }\n" +
"}";
private static final File classesdir = new File("intersectionproperties");
private static final JavaCompiler comp =
ToolProvider.getSystemJavaCompiler();
private static final StandardJavaFileManager fm =
comp.getStandardFileManager(null, null, null);
public void runOne(final String Test_name, final String Test_contents)
throws IOException {
System.err.println("Testing " + Test_name);
final Iterable<? extends JavaFileObject> files =
fm.getJavaFileObjectsFromFiles(Collections.singleton(writeFile(classesdir, Test_name, Test_contents)));
final JavacTask ct =
(JavacTask)comp.getTask(null, fm, null, null, null, files);
ct.setProcessors(Collections.singleton(new TestProcessor()));
if (!ct.call()) {
System.err.println("Compilation unexpectedly failed");
errors++;
}
}
public void run() throws IOException {
runOne(Intersection_name, Intersection_contents);
if (0 != errors)
throw new RuntimeException(errors + " errors occurred");
}
public static void main(String... args) throws IOException {
new IntersectionPropertiesTest().run();
}
private static File writeFile(File dir, String path, String body)
throws IOException {
File f = new File(dir, path);
f.getParentFile().mkdirs();
try (FileWriter out = new FileWriter(f)) {
out.write(body);
}
return f;
}
private class TestProcessor extends JavacTestingAbstractProcessor {
private Set<? extends Element> rootElements;
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
rootElements = roundEnv.getRootElements();
if (!rootElements.isEmpty()) {
performCheck();
}
return true;
}
private void performCheck() {
TypeElement typeElement = (TypeElement) rootElements.iterator().next();
ExecutableElement method = ElementFilter.methodsIn(typeElement.getEnclosedElements()).get(0);
TypeVariable typeVariable = (TypeVariable) method.getParameters().get(0).asType();
final TypeMirror upperBound = typeVariable.getUpperBound();
TypeParameterElement typeParameterElement = ((TypeParameterElement) typeVariable.asElement());
final List<? extends TypeMirror> bounds = typeParameterElement.getBounds();
final HashSet<TypeMirror> actual = new HashSet<TypeMirror>(processingEnv.getTypeUtils().directSupertypes(upperBound));
final HashSet<TypeMirror> expected = new HashSet<TypeMirror>(bounds);
if (!expected.equals(actual)) {
System.err.println("Mismatched expected and actual bounds.");
System.err.println("Expected:");
for(TypeMirror tm : expected)
System.err.println(" " + tm);
System.err.println("Actual:");
for(TypeMirror tm : actual)
System.err.println(" " + tm);
errors++;
}
}
}
}