# HG changeset patch # User Liam Miller-Cushon # Date 1461282086 25200 # Thu Apr 21 16:41:26 2016 -0700 # Node ID 3ebb24f215945c55260257fcbec5063402a011e5 # Parent ddd1734b81ac5277d79c62d870dfa5190a59d3d6 8154270: javac wrongly rejects some class literals as annotation element values diff -r ddd1734b81ac -r 3ebb24f21594 src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Apr 21 13:37:01 2016 -0700 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Apr 21 16:41:26 2016 -0700 @@ -826,7 +826,7 @@ } public void visitClass(Attribute.Class clazz) { databuf.appendByte('c'); - databuf.appendChar(pool.put(typeSig(clazz.classType))); + databuf.appendChar(pool.put(typeSig(types.erasure(clazz.classType)))); } public void visitCompound(Attribute.Compound compound) { databuf.appendByte('@'); diff -r ddd1734b81ac -r 3ebb24f21594 test/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java Thu Apr 21 16:41:26 2016 -0700 @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2016 Google Inc. 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. + */ + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.util.Arrays; + +/* + * @test + * @bug 8154270 + * @summary javac wrongly rejects some class literals as annotation element values + * @compile EraseClassInfoAnnotationValueTest.java + * @compile -implicit:none Other.java + * @run main EraseClassInfoAnnotationValueTest + */ +public class EraseClassInfoAnnotationValueTest { + + @Retention(RetentionPolicy.RUNTIME) + public @interface A { + Class value(); + } + + static class ParametricType { + + @A(Inner.class) + public static class Nested {} + + public class Inner {} + } + + public static void main(String[] args) { + Class clazz = ParametricType.Nested.class.getAnnotation(A.class).value(); + if (!clazz.equals(ParametricType.Inner.class)) { + throw new AssertionError(clazz); + } + } +} diff -r ddd1734b81ac -r 3ebb24f21594 test/tools/javac/annotations/T8154270/Other.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/T8154270/Other.java Thu Apr 21 16:41:26 2016 -0700 @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016 Google Inc. 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. + */ + +/** + * Tests separate compilation. + */ +public class Other { + Class clazz = EraseClassInfoAnnotationValueTest.ParametricType.Nested.class; +}