archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8016880: 42 tests in annot102* fail with compile-time errors

Browse source 
Fixes error in type equality when bounds of type variables have annotations.

Reviewed-by: jjg, mcimadamore
This commit is contained in:
Eric McCorkle 2013-07-23 20:42:54 -04:00
parent 2a95b6ac74
commit be2ea6f949
2 changed files with 54 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ public class Types {
* @return the upper bound of the given type * @return the upper bound of the given type
*/ */
public Type upperBound(Type t) { public Type upperBound(Type t) {
return upperBound.visit(t); return upperBound.visit(t).unannotatedType();
} }
// where // where
private final MapVisitor<Void> upperBound = new MapVisitor<Void>() { private final MapVisitor<Void> upperBound = new MapVisitor<Void>() {
@ -1130,9 +1130,9 @@ public class Types {
HashSet<UniqueType> set = new HashSet<UniqueType>(); HashSet<UniqueType> set = new HashSet<UniqueType>();
for (Type x : interfaces(t)) for (Type x : interfaces(t))
set.add(new UniqueType(x, Types.this)); set.add(new UniqueType(x.unannotatedType(), Types.this));
for (Type x : interfaces(s)) { for (Type x : interfaces(s)) {
if (!set.remove(new UniqueType(x, Types.this))) if (!set.remove(new UniqueType(x.unannotatedType(), Types.this)))
return false; return false;
} }
return (set.isEmpty()); return (set.isEmpty());

51
langtools/test/tools/javac/annotations/typeAnnotations/ErasureTest.java Normal file
View file

@ -0,0 +1,51 @@
/*
* 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 8016013
* @summary Compiler incorrectly treats annotated and unannotated type variable bounds as different types
* @compile -doe ErasureTest.java
*/
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER })
@interface Advanced {}
class U {}
interface I {}
class ErasureTest {
<T extends U & @Advanced I> void TestMethod(T arg1) { }
public static void main(String argv[]) {
ErasureTest t1 = new ErasureTest(){
public <T extends @Advanced U & I> void TestMethod(T arg1) { }
};
ErasureTest t2 = new ErasureTest(){
public <T extends U & @Advanced I> void TestMethod(T arg1) { }
};
}
}