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

8020997: TreeMaker.AnnotationBuilder creates broken element literals with repeating annotations

Browse source 
Reviewed-by: jjg, jfranck
This commit is contained in:
Vicente Romero 2013-08-07 10:41:20 +01:00
parent 7e65ce7648
commit 0fb4cd9d38
2 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
langtools/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
View file

@ -781,7 +781,7 @@ public class TreeMaker implements JCTree.Factory {
class AnnotationBuilder implements Attribute.Visitor { class AnnotationBuilder implements Attribute.Visitor {
JCExpression result = null; JCExpression result = null;
public void visitConstant(Attribute.Constant v) { public void visitConstant(Attribute.Constant v) {
result = Literal(v.value); result = Literal(v.type.getTag(), v.value);
} }
public void visitClass(Attribute.Class clazz) { public void visitClass(Attribute.Class clazz) {
result = ClassLiteral(clazz.classType).setType(syms.classType); result = ClassLiteral(clazz.classType).setType(syms.classType);

46
langtools/test/tools/javac/T8020997/CannotCompileRepeatedAnnoTest.java Normal file
View file

@ -0,0 +1,46 @@
/*
* 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 8020997
* @summary Cannot compile class with repeating annotation
* @compile CannotCompileRepeatedAnnoTest.java
*/
import java.lang.annotation.*;
@Anno(req = true)
@Anno()
public class CannotCompileRepeatedAnnoTest {
}
@Repeatable(Container.class)
@interface Anno {
boolean req() default false;
}
@interface Container{
Anno[] value();
}