From 16a35b5eab316c1c13c3871665cc81b1acffa096 Mon Sep 17 00:00:00 2001 From: jfranck Date: Wed, 8 May 2013 14:10:53 +0200 Subject: [PATCH] 8013485: javac can't handle annotations with a from a previous compilation unit Reviewed-by: mcimadamore --- .../com/sun/tools/javac/comp/Check.java | 6 +-- .../annotations/clinit/AnnoWithClinit1.java | 52 +++++++++++++++++++ .../clinit/AnnoWithClinitFail.java | 45 ++++++++++++++++ .../annotations/clinit/AnnoWithClinitFail.out | 3 ++ 4 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 test/tools/javac/annotations/clinit/AnnoWithClinit1.java create mode 100644 test/tools/javac/annotations/clinit/AnnoWithClinitFail.java create mode 100644 test/tools/javac/annotations/clinit/AnnoWithClinitFail.out diff --git a/src/share/classes/com/sun/tools/javac/comp/Check.java b/src/share/classes/com/sun/tools/javac/comp/Check.java index 01fc16ab..f54d5162 100644 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java @@ -3024,9 +3024,9 @@ public class Check { // collect an inventory of the annotation elements Set members = new LinkedHashSet(); 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 diff --git a/test/tools/javac/annotations/clinit/AnnoWithClinit1.java b/test/tools/javac/annotations/clinit/AnnoWithClinit1.java new file mode 100644 index 00000000..4c3498f1 --- /dev/null +++ b/test/tools/javac/annotations/clinit/AnnoWithClinit1.java @@ -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 + // 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 { } diff --git a/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java b/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java new file mode 100644 index 00000000..52d0e8a5 --- /dev/null +++ b/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java @@ -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 + // when the this anno instance is checked + + class Foo {} +} + +@AnnoWithClinitFail +class TestAnnoWithClinitFail { } diff --git a/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out b/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out new file mode 100644 index 00000000..c9526b43 --- /dev/null +++ b/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out @@ -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 -- GitLab