stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8235457: Crash when reporting a message about an annotation on a module

Browse Source 
8235458: Problem caused by imports in a module-info.java file

Reviewed-by: jjg
This commit is contained in:
Jeremy Kuhn 2019-12-11 11:55:50 -08:00 committed by Jonathan Gibbons
parent 5fd2efb7e9
commit cbe604cf5d
9 changed files with 248 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java
View File

@ -277,6 +277,9 @@ public class JavacElements implements Elements {
Symbol sym = cast(Symbol.class, e);
class Vis extends JCTree.Visitor {
List<JCAnnotation> result = null;
public void visitModuleDef(JCModuleDecl tree) {
result = tree.mods.annotations;
}
public void visitPackageDef(JCPackageDecl tree) {
result = tree.annotations;
}

17
src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
View File

@ -1515,10 +1515,19 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
private List<ModuleSymbol> getModuleInfoFiles(List<? extends JCCompilationUnit> units) {
List<ModuleSymbol> modules = List.nil();
for (JCCompilationUnit unit : units) {
if (isModuleInfo(unit.sourcefile, JavaFileObject.Kind.SOURCE) &&
unit.defs.nonEmpty() &&
unit.defs.head.hasTag(Tag.MODULEDEF)) {
modules = modules.prepend(unit.modle);
if (isModuleInfo(unit.sourcefile, JavaFileObject.Kind.SOURCE) && unit.defs.nonEmpty()) {
for (JCTree tree : unit.defs) {
if (tree.hasTag(Tag.IMPORT)) {
continue;
}
else if (tree.hasTag(Tag.MODULEDEF)) {
modules = modules.prepend(unit.modle);
break;
}
else {
break;
}
}
}
}
return modules.reverse();

78
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/ReportOnImportedModuleAnnotation.java Normal file
View File

@ -0,0 +1,78 @@
/*
* Copyright (c) 2019, 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 8235457
* 8235458
* @summary javac shouldn't fail when an annotation processor report a message about an annotation on a module
* javac should process annotated module when imports statement are present
* @modules jdk.compiler
*/
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import javax.tools.JavaCompiler;
import javax.tools.StandardJavaFileManager;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
public class ReportOnImportedModuleAnnotation {
public static void main(String[] args) throws Exception {
final Path testBasePath = Path.of(System.getProperty("test.src"));
final Path testOutputPath = Path.of(System.getProperty("test.classes"));
final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
// Compile annotation and processor modules
StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
fileManager.setLocationFromPaths(StandardLocation.MODULE_SOURCE_PATH, List.of(testBasePath.resolve("mods-src1/")));
fileManager.setLocationFromPaths(StandardLocation.CLASS_OUTPUT, List.of(testOutputPath));
compiler.getTask(new PrintWriter(System.out), fileManager, null, List.of("--module", "annotation,processor"), null, null).call();
// Compile mod modules
fileManager = compiler.getStandardFileManager(null, null, null);
fileManager.setLocationFromPaths(StandardLocation.MODULE_SOURCE_PATH, List.of(testBasePath.resolve("mods-src2/")));
fileManager.setLocationFromPaths(StandardLocation.MODULE_PATH, List.of(testOutputPath.resolve("annotation")));
fileManager.setLocationFromPaths(StandardLocation.ANNOTATION_PROCESSOR_MODULE_PATH, List.of(testOutputPath.resolve("processor")));
fileManager.setLocationFromPaths(StandardLocation.CLASS_OUTPUT, List.of(testOutputPath));
final StringWriter outputWriter = new StringWriter();
compiler.getTask(outputWriter, fileManager, null, List.of("-XDrawDiagnostics", "--module", "mod"), null, null).call();
String actualOutput = outputWriter.toString();
String expectedOutput = Files.readString(testBasePath.resolve("ReportOnImportedModuleAnnotation.out"));
String lineSep = System.getProperty("line.separator");
if(!actualOutput.replace(lineSep, "\n").equals(expectedOutput.replace(lineSep, "\n"))) {
System.err.println("Expected: [" + expectedOutput + "]");
System.err.println("Received: [" + actualOutput + "]");
throw new Exception("Invalid output");
}
}
}

2
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/ReportOnImportedModuleAnnotation.out Normal file
View File

@ -0,0 +1,2 @@
module-info.java:5:1: compiler.warn.proc.messager: Module warning
1 warning

35
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/mods-src1/annotation/annotation/ModuleWarn.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright (c) 2019, 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.
*/
package annotation;
import java.lang.annotation.Target;
import java.lang.annotation.Retention;
import java.lang.annotation.ElementType;
import java.lang.annotation.RetentionPolicy;
@Target(ElementType.MODULE)
@Retention(RetentionPolicy.SOURCE)
public @interface ModuleWarn {
}

26
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/mods-src1/annotation/module-info.java Normal file
View File

@ -0,0 +1,26 @@
/*
* Copyright (c) 2019, 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.
*/
module annotation {
exports annotation;
}

30
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/mods-src1/processor/module-info.java Normal file
View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2019, 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.
*/
module processor {
requires java.compiler;
exports processor;
provides javax.annotation.processing.Processor with processor.ModuleWarnProcessor;
}

53
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/mods-src1/processor/processor/ModuleWarnProcessor.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2019, 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.
*/
package processor;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.TypeElement;
import java.util.Set;
import javax.annotation.processing.RoundEnvironment;
import javax.tools.Diagnostic.Kind;
import javax.lang.model.element.AnnotationMirror;
@SupportedAnnotationTypes("annotation.ModuleWarn")
public class ModuleWarnProcessor extends AbstractProcessor {
@Override
public SourceVersion getSupportedSourceVersion() {
return this.processingEnv.getSourceVersion().compareTo(SourceVersion.RELEASE_9) < 0 ? SourceVersion.RELEASE_9 : this.processingEnv.getSourceVersion();
}
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
annotations.stream().flatMap(annotation -> roundEnv.getElementsAnnotatedWith(annotation).stream()).forEach(element -> {
for(AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
this.processingEnv.getMessager().printMessage(Kind.MANDATORY_WARNING, "Module warning", element, annotationMirror);
}
});
return false;
}
}

8
test/langtools/tools/javac/processing/ReportOnImportedModuleAnnotation/mods-src2/mod/module-info.java Normal file
View File

@ -0,0 +1,8 @@
/* /nodynamiccopyright/ */
import annotation.ModuleWarn;
@ModuleWarn
module mod {
requires annotation;
}