From 5431668cb92a8ef2ccfe1059db1cde0e5d98adce Mon Sep 17 00:00:00 2001
From: Archie Cobbs <acobbs@openjdk.org>
Date: Sat, 25 Jan 2025 18:02:18 +0000
Subject: [PATCH] 8348212: Need to add warn() step to JavacTaskImpl after
 JDK-8344148

Reviewed-by: mcimadamore
---
 .../sun/tools/javac/api/JavacTaskImpl.java    |  4 +-
 .../javac/api/TestJavacTaskWithWarning.java   | 88 +++++++++++++++++++
 2 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 test/langtools/tools/javac/api/TestJavacTaskWithWarning.java

diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
index 80b1e9d7ea9..980ce060c33 100644
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
@@ -401,12 +401,12 @@ public class JavacTaskImpl extends BasicJavacTask {
         final ListBuffer<Element> results = new ListBuffer<>();
         try {
             if (classes == null) {
-                handleFlowResults(compiler.flow(compiler.attribute(compiler.todo)), results);
+                handleFlowResults(compiler.warn(compiler.flow(compiler.attribute(compiler.todo))), results);
             } else {
                 Filter f = new Filter() {
                     @Override
                     public void process(Env<AttrContext> env) {
-                        handleFlowResults(compiler.flow(compiler.attribute(env)), results);
+                        handleFlowResults(compiler.warn(compiler.flow(compiler.attribute(env))), results);
                     }
                 };
                 f.run(compiler.todo, classes);
diff --git a/test/langtools/tools/javac/api/TestJavacTaskWithWarning.java b/test/langtools/tools/javac/api/TestJavacTaskWithWarning.java
new file mode 100644
index 00000000000..70d8332720e
--- /dev/null
+++ b/test/langtools/tools/javac/api/TestJavacTaskWithWarning.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2025, 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     8348212
+ * @summary Ensure the warn() phase executes when the compiler is invoked via the API
+ * @modules jdk.compiler/com.sun.tools.javac.api
+ */
+
+import com.sun.tools.javac.api.JavacTaskImpl;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.List;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+public class TestJavacTaskWithWarning {
+
+    static final JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+    static final StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null);
+
+    public static void warningTest() throws Exception {
+
+        // Create a source file that will generate a warning
+        String srcdir = System.getProperty("test.src");
+        File file = new File(srcdir, "GeneratesWarning.java");
+        try (PrintStream out = new PrintStream(new FileOutputStream(file))) {
+            out.print(
+                """
+                public class GeneratesWarning {
+                    public GeneratesWarning() {
+                        hashCode();     // generates a "this-escape" warning
+                    }
+                }
+                """);
+        }
+
+        // Compile it using API
+        Iterable<? extends JavaFileObject> files = fm.getJavaFileObjectsFromFiles(List.of(file));
+        StringWriter buf = new StringWriter();
+        List<String> options = List.of(
+          "-Xlint:this-escape",
+          "-XDrawDiagnostics"
+        );
+        JavacTaskImpl task = (JavacTaskImpl)compiler.getTask(new PrintWriter(buf), fm, null, options, null, files);
+        task.analyze();
+
+        // Verify warning was generated
+        if (!buf.toString().contains("compiler.warn.possible.this.escape"))
+            throw new AssertionError("warning not found in:\n" + buf);
+    }
+
+    public static void main(String[] args) throws Exception {
+        try {
+            warningTest();
+        } finally {
+            fm.close();
+        }
+    }
+}