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

8068639: Make certain annotation classfile warnings opt-in

Browse source 
Reviewed-by: jjg
This commit is contained in:
Joe Darcy 2015-01-07 17:06:47 -08:00
parent e6ea1f0ff8
commit 5cb7065612
3 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1740,15 +1740,17 @@ public class ClassReader {
// The method wasn't found: emit a warning and recover // The method wasn't found: emit a warning and recover
JavaFileObject prevSource = log.useSource(requestingOwner.classfile); JavaFileObject prevSource = log.useSource(requestingOwner.classfile);
try { try {
if (failure == null) { if (lintClassfile) {
log.warning("annotation.method.not.found", if (failure == null) {
container, log.warning("annotation.method.not.found",
name); container,
} else { name);
log.warning("annotation.method.not.found.reason", } else {
container, log.warning("annotation.method.not.found.reason",
name, container,
failure.getDetailValue());//diagnostic, if present name,
failure.getDetailValue());//diagnostic, if present
}
} }
} finally { } finally {
log.useSource(prevSource); log.useSource(prevSource);

7
langtools/test/tools/javac/annotations/6214965/T6214965.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,9 +23,10 @@
/** /**
* @test * @test
* @bug 6214965 6365854 * @bug 6214965 6365854 8068639
* @summary Compiler crash on redefing nested annotation types * @summary Compiler crash on redefing nested annotation types
* @compile CompilerAnnotationTest.java CompilerAnnotationTest2.java * @compile CompilerAnnotationTest.java CompilerAnnotationTest2.java
* @compile CompilerAnnotationTest2bad.java * @compile CompilerAnnotationTest2bad.java
* @compile/ref=T6214965.out -XDrawDiagnostics CompilerAnnotationTest2bad.java * @compile/ref=T6214965.out -XDrawDiagnostics -Xlint:classfile CompilerAnnotationTest2bad.java
* @compile -Werror CompilerAnnotationTest2bad.java
*/ */

10
langtools/test/tools/javac/annotations/6365854/T6365854.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
/** /**
* @test * @test
* @bug 6365854 * @bug 6365854 8068639
* @summary javac crashes when compiling against an annotated class * @summary javac crashes when compiling against an annotated class
* @compile TestAnnotation.java TestCore.java * @compile TestAnnotation.java TestCore.java
* @clean test.annotation.TestAnnotation * @clean test.annotation.TestAnnotation
@ -33,11 +33,11 @@
* *
* @compile TestAnnotation.java TestCore.java * @compile TestAnnotation.java TestCore.java
* @clean test.annotation.TestAnnotation * @clean test.annotation.TestAnnotation
* @compile/ref=test1.out -XDrawDiagnostics T6365854.java * @compile/ref=test1.out -XDrawDiagnostics -Xlint:classfile T6365854.java
* @run main T6365854 * @run main T6365854
* @compile/ref=test2.out -XDrawDiagnostics evolve/TestAnnotation.java T6365854.java * @compile/ref=test2.out -XDrawDiagnostics -Xlint:classfile evolve/TestAnnotation.java T6365854.java
* @run main T6365854 * @run main T6365854
* @compile/ref=test2.out -XDrawDiagnostics T6365854.java * @compile/ref=test2.out -XDrawDiagnostics -Xlint:classfile T6365854.java
* @run main T6365854 * @run main T6365854
*/ */