stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8154270: javac wrongly rejects some class literals as annotation element values

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Liam Miller-Cushon 2016-04-29 14:18:09 -07:00 committed by Jonathan Gibbons
parent dbaca996ad
commit 9290ce0c7b
3 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
View File

@ -826,7 +826,7 @@ public class ClassWriter extends ClassFile {
}
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('@');

57
langtools/test/tools/javac/annotations/T8154270/EraseClassInfoAnnotationValueTest.java Normal file
View File

@ -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<T> {
@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);
}
}
}

29
langtools/test/tools/javac/annotations/T8154270/Other.java Normal file
View File

@ -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;
}