Add option -proc:full to javac (#5)

Cherry-pick openjdk/jdk17u@561f956 and openjdk/jdk17u@6d8febb.

* 8308245: Add -proc:full to describe current default annotation processing policy

Backport-of: 42ecc8a

* 8309870: Using -proc:full should be considered requesting explicit annotation processing

Backport-of: 3ce1240

---------

Co-authored-by: Andrew Lu <[email protected]>

src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2023, 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
@@ -1270,7 +1270,10 @@ static boolean explicitAnnotationProcessingRequested(Options options) {
  options.isSet(PROCESSOR_PATH) ||
  options.isSet(PROCESSOR_MODULE_PATH) ||
  options.isSet(PROC, "only") ||
+ options.isSet(PROC, "full") ||
+ options.isSet(A) ||
  options.isSet(XPRINT);
+ // Skipping -XprintRounds and -XprintProcessorInfo
  }
 
  public void setDeferredDiagnosticHandler(Log.DeferredDiagnosticHandler deferredDiagnosticHandler) {

src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2023, 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
@@ -83,6 +83,11 @@
  * {@code handleOption} then calls {@link #process process} providing a suitable
  * {@link OptionHelper} to provide access the compiler state.
  *
+ *
+ * <p>Maintenance note: when adding new annotation processing related
+ * options, the list of options regarded as requesting explicit
+ * annotation processing in JavaCompiler should be updated.
+ *
  * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk. This code and its internal interfaces are subject to change
@@ -285,7 +290,7 @@ public void process(OptionHelper helper, String option, String arg) throws Inval
  }
  },
 
- PROC("-proc:", "opt.proc.none.only", STANDARD, BASIC,  ONEOF, "none", "only"),
+ PROC("-proc:", "opt.proc.none.only", STANDARD, BASIC, ONEOF, "none", "only", "full"),
 
  PROCESSOR("-processor", "opt.arg.class.list", "opt.processor", STANDARD, BASIC),
 

test/langtools/tools/javac/processing/environment/round/TestContext.java

@@ -31,7 +31,7 @@
  * jdk.compiler/com.sun.tools.javac.processing
  * jdk.compiler/com.sun.tools.javac.util
  * @build JavacTestingAbstractProcessor TestContext
- * @compile/process -processor TestContext -XprintRounds TestContext
+ * @compile/process -processor TestContext -XprintRounds -proc:full TestContext
  */
 
 import java.io.*;

test/langtools/tools/javac/processing/options/TestProcOption.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023, 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 8308245
+ * @summary Test trivial handling of -proc:full option
+ * @compile -proc:full TestProcOption.java
+ * @run main TestProcOption
+ */
+
+/*
+ * The test verifies that compilation takes place when -proc:full is used.
+ */
+public class TestProcOption {
+ private TestProcOption(){};
+
+ public static void main(String... args) {
+ ; // do nothing
+ }
+}