diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java
index d2bcf523e3e..7cdc2abc1ef 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java
@@ -46,6 +46,7 @@ public class JavacMessager implements Messager {
Log log;
JavacProcessingEnvironment processingEnv;
int errorCount = 0;
+ int warningCount = 0;
JavacMessager(Context context, JavacProcessingEnvironment processingEnv) {
log = Log.instance(context);
@@ -116,10 +117,12 @@ public class JavacMessager implements Messager {
break;
case WARNING:
+ warningCount++;
log.warning(pos, "proc.messager", msg.toString());
break;
case MANDATORY_WARNING:
+ warningCount++;
log.mandatoryWarning(pos, "proc.messager", msg.toString());
break;
@@ -167,6 +170,10 @@ public class JavacMessager implements Messager {
return errorCount;
}
+ public int warningCount() {
+ return warningCount;
+ }
+
public void newRound(Context context) {
log = Log.instance(context);
errorCount = 0;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 800a1a21e1b..ce01f0cb530 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -95,6 +95,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
private final boolean lint;
private final boolean procOnly;
private final boolean fatalErrors;
+ private final boolean werror;
private boolean foundTypeProcessors;
private final JavacFiler filer;
@@ -157,6 +158,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
procOnly = options.get("-proc:only") != null ||
options.get("-Xprint") != null;
fatalErrors = options.get("fatalEnterError") != null;
+ werror = options.get("-Werror") != null;
platformAnnotations = initPlatformAnnotations();
foundTypeProcessors = false;
@@ -827,7 +829,8 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
runAround:
while(true) {
- if (fatalErrors && compiler.errorCount() != 0) {
+ if ((fatalErrors && compiler.errorCount() != 0)
+ || (werror && compiler.warningCount() != 0)) {
errorStatus = true;
break runAround;
}
@@ -906,7 +909,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
roots = runLastRound(roundNumber, errorStatus, compiler, roots, taskListener);
// Set error status for any files compiled and generated in
// the last round
- if (log.unrecoverableError)
+ if (log.unrecoverableError || (werror && compiler.warningCount() != 0))
errorStatus = true;
compiler.close(false);
@@ -938,6 +941,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING));
if (errorStatus) {
+ compiler.log.nwarnings += messager.warningCount();
compiler.log.nerrors += messager.errorCount();
if (compiler.errorCount() == 0)
compiler.log.nerrors++;
diff --git a/langtools/test/tools/javac/processing/werror/WError1.java b/langtools/test/tools/javac/processing/werror/WError1.java
new file mode 100644
index 00000000000..a247b72723e
--- /dev/null
+++ b/langtools/test/tools/javac/processing/werror/WError1.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, 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 6403456
+ * @summary -Werror should work with annotation processing
+ * @compile WError1.java
+ * @compile -proc:only -processor WError1 WError1.java
+ * @compile/fail/ref=WError1.out -XDrawDiagnostics -Werror -proc:only -processor WError1 WError1.java
+ */
+
+import java.io.*;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.tools.*;
+
+@SupportedAnnotationTypes("*")
+public class WError1 extends AbstractProcessor {
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ Messager messager = processingEnv.getMessager();
+ if (++round == 1) {
+ messager.printMessage(Diagnostic.Kind.WARNING, "round 1");
+ }
+ return true;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ int round = 0;
+}
diff --git a/langtools/test/tools/javac/processing/werror/WError1.out b/langtools/test/tools/javac/processing/werror/WError1.out
new file mode 100644
index 00000000000..17c92418773
--- /dev/null
+++ b/langtools/test/tools/javac/processing/werror/WError1.out
@@ -0,0 +1,4 @@
+- compiler.warn.proc.messager: round 1
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/processing/werror/WErrorGen.java b/langtools/test/tools/javac/processing/werror/WErrorGen.java
new file mode 100644
index 00000000000..f0f21cf786b
--- /dev/null
+++ b/langtools/test/tools/javac/processing/werror/WErrorGen.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2010, 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 6403456
+ * @summary -Werror should work with annotation processing
+ * @compile WErrorGen.java
+ * @compile -proc:only -processor WErrorGen WErrorGen.java
+ * @compile/fail/ref=WErrorGen.out -XDrawDiagnostics -Werror -Xlint:rawtypes -processor WErrorGen WErrorGen.java
+ */
+
+import java.io.*;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.tools.*;
+
+@SupportedAnnotationTypes("*")
+public class WErrorGen extends AbstractProcessor {
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ Filer filer = processingEnv.getFiler();
+ if (roundEnv.processingOver()) {
+ try {
+ JavaFileObject fo = filer.createSourceFile("Gen");
+ Writer out = fo.openWriter();
+ out.write("import java.util.*; class Gen { List l; }");
+ out.close();
+ } catch (IOException e) {
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+}
diff --git a/langtools/test/tools/javac/processing/werror/WErrorGen.out b/langtools/test/tools/javac/processing/werror/WErrorGen.out
new file mode 100644
index 00000000000..eb84b7517d0
--- /dev/null
+++ b/langtools/test/tools/javac/processing/werror/WErrorGen.out
@@ -0,0 +1,4 @@
+Gen.java:1:33: compiler.warn.raw.class.use: java.util.List, java.util.List<E>
+- compiler.err.warnings.and.werror
+1 error
+1 warning
diff --git a/langtools/test/tools/javac/processing/werror/WErrorLast.java b/langtools/test/tools/javac/processing/werror/WErrorLast.java
new file mode 100644
index 00000000000..e2ba67f5c9e
--- /dev/null
+++ b/langtools/test/tools/javac/processing/werror/WErrorLast.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010, 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 6403456
+ * @summary -Werror should work with annotation processing
+ * @compile WErrorLast.java
+ * @compile -proc:only -processor WErrorLast WErrorLast.java
+ * @compile/fail/ref=WErrorLast.out -XDrawDiagnostics -Werror -proc:only -processor WErrorLast WErrorLast.java
+ */
+
+import java.io.*;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.tools.*;
+
+@SupportedAnnotationTypes("*")
+public class WErrorLast extends AbstractProcessor {
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations,
+ RoundEnvironment roundEnv) {
+ Messager messager = processingEnv.getMessager();
+ if (roundEnv.processingOver()) {
+ messager.printMessage(Diagnostic.Kind.WARNING, "last round");
+ }
+ return true;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+}
diff --git a/langtools/test/tools/javac/processing/werror/WErrorLast.out b/langtools/test/tools/javac/processing/werror/WErrorLast.out
new file mode 100644
index 00000000000..4ba8fc5a87a
--- /dev/null
+++ b/langtools/test/tools/javac/processing/werror/WErrorLast.out
@@ -0,0 +1,4 @@
+- compiler.warn.proc.messager: last round
+- compiler.err.warnings.and.werror
+1 error
+1 warning