mirror of
https://github.com/termux/termux-packages.git
synced 2024-12-04 18:45:52 +00:00
146 lines
6.6 KiB
Diff
146 lines
6.6 KiB
Diff
From e1fc904e7b7aa51163452f9a2246d03b11bd2dfd Mon Sep 17 00:00:00 2001
|
|
From: Andrew Lu <andrewlu@openjdk.org>
|
|
Date: Thu, 25 Jan 2024 02:25:40 +0000
|
|
Subject: [PATCH 1/2] 8308245: Add -proc:full to describe current default
|
|
annotation processing policy
|
|
|
|
Backport-of: 42ecc8a37ffc7e4ad7beb49cac7d821c00a5568e
|
|
---
|
|
.../com/sun/tools/javac/main/Option.java | 2 +-
|
|
.../environment/round/TestContext.java | 2 +-
|
|
.../processing/options/TestProcOption.java | 41 +++++++++++++++++++
|
|
3 files changed, 43 insertions(+), 2 deletions(-)
|
|
create mode 100644 test/langtools/tools/javac/processing/options/TestProcOption.java
|
|
|
|
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
|
|
index a6d050b0a6f..695292c9e03 100644
|
|
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
|
|
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
|
|
@@ -285,7 +285,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),
|
|
|
|
diff --git a/test/langtools/tools/javac/processing/environment/round/TestContext.java b/test/langtools/tools/javac/processing/environment/round/TestContext.java
|
|
index f572d2d9c73..4d0b1674ecc 100644
|
|
--- a/test/langtools/tools/javac/processing/environment/round/TestContext.java
|
|
+++ b/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.*;
|
|
diff --git a/test/langtools/tools/javac/processing/options/TestProcOption.java b/test/langtools/tools/javac/processing/options/TestProcOption.java
|
|
new file mode 100644
|
|
index 00000000000..882077a00c3
|
|
--- /dev/null
|
|
+++ b/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
|
|
+ }
|
|
+}
|
|
|
|
From 99afe5f127ca4f9f63ce951948ddcec783aa2a94 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Lu <andrewlu@openjdk.org>
|
|
Date: Mon, 29 Jan 2024 08:24:55 +0000
|
|
Subject: [PATCH 2/2] 8309870: Using -proc:full should be considered requesting
|
|
explicit annotation processing
|
|
|
|
Backport-of: 3ce1240ca1b4139980444c171e317f4bfeff9314
|
|
---
|
|
.../classes/com/sun/tools/javac/main/JavaCompiler.java | 5 ++++-
|
|
.../share/classes/com/sun/tools/javac/main/Option.java | 7 ++++++-
|
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
|
|
index 1b8b7077ed8..2a8807b126b 100644
|
|
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/JavaCompiler.java
|
|
+++ b/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) {
|
|
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
|
|
index 695292c9e03..f88a328ca46 100644
|
|
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java
|
|
+++ b/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
|