Mercurial > hg > openjdk > bsd-port > langtools
changeset 2043:20376611cb3b
Merge
author | lana |
---|---|
date | Thu, 20 Nov 2014 14:01:11 -0800 |
parents | b2cf7f00a624 (current diff) 9755f64a08e2 (diff) |
children | 979f55cda0e2 |
files | |
diffstat | 4 files changed, 103 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Nov 20 09:53:09 2014 -0800 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java Thu Nov 20 14:01:11 2014 -0800 @@ -2400,9 +2400,9 @@ } }); 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); // count them off as they're annotated
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/clinit/AnnoWithClinit1.java Thu Nov 20 14:01:11 2014 -0800 @@ -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 { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/clinit/AnnoWithClinitFail.java Thu Nov 20 14:01:11 2014 -0800 @@ -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 { }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/annotations/clinit/AnnoWithClinitFail.out Thu Nov 20 14:01:11 2014 -0800 @@ -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