archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8013485: javac can't handle annotations with a <clinit> from a previous compilation unit

Browse source 
Reviewed-by: mcimadamore
This commit is contained in:
Joel Borggrén-Franck 2013-05-08 14:10:53 +02:00
parent 5b3642b5ce
commit d5eeeb875b
4 changed files with 103 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/comp/Check.java
View file

@ -3024,9 +3024,9 @@ public class Check {
// collect an inventory of the annotation elements
Set<MethodSymbol> members = new LinkedHashSet<MethodSymbol>();
for (Scope.Entry e = a.annotationType.type.tsym.members().elems;
e != null;
e = e.sibling)
if (e.sym.kind == MTH)
e != null;
e = e.sibling)
if (e.sym.kind == MTH && e.sym.name != names.clinit)
members.add((MethodSymbol) e.sym);
// remove the ones that are assigned values

52
langtools/test/tools/javac/annotations/clinit/AnnoWithClinit1.java Normal file
View file

@ -0,0 +1,52 @@
/*
* 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 8013485
* @summary Annotations that gets a clinit can't be verified for correct elements in a second compilation unit
* @compile AnnoWithClinit1.java
*/
public @interface AnnoWithClinit1 {
Foo f = new Foo();
@AnnoWithClinit1
static class C {} // this is in the same CU so there wont be a
// <clinit> when the this anno instance is checked
class Foo {}
}
@AnnoWithClinit1
class BarAnnoClinit1 {}
@interface AAnnoClinit1 {
Runnable r2 = new Runnable() { public void run() { }};
String str1();
String str2withdefault() default "bar";
}
@AAnnoClinit1(str1="value")
class TestAnnoClinit1 { }

45
langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java Normal file
View file

@ -0,0 +1,45 @@
/*
* 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 8013485
* @summary Annotations that gets a clinit can't be verified for correct elements in a second compilation unit
* @compile/fail/ref=AnnoWithClinitFail.out -XDrawDiagnostics AnnoWithClinitFail.java
*/
public @interface AnnoWithClinitFail {
Foo f = new Foo();
String foo();
String bar() default "bar";
@AnnoWithClinitFail
static class C {} // this is in the same CU so there wont be a
// <clinit> when the this anno instance is checked
class Foo {}
}
@AnnoWithClinitFail
class TestAnnoWithClinitFail { }

3
langtools/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out Normal file
View file

@ -0,0 +1,3 @@
AnnoWithClinitFail.java:37:5: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo
AnnoWithClinitFail.java:44:1: compiler.err.annotation.missing.default.value: AnnoWithClinitFail, foo
2 errors