openjdk · archiecobbs · Feb 18, 2025 · Feb 18, 2025 · Feb 18, 2025 · Mar 24, 2025
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
@@ -47,7 +47,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
         build/tools/jigsaw \
         build/tools/depend, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
-    DISABLED_WARNINGS := dangling-doc-comments options, \
+    DISABLED_WARNINGS := dangling-doc-comments options suppression, \
     JAVAC_FLAGS := \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
@@ -81,7 +81,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/depend, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
-    DISABLED_WARNINGS := options, \
+    DISABLED_WARNINGS := options suppression, \
     JAVAC_FLAGS := \
         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \

diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk
@@ -40,7 +40,7 @@ $(eval $(call SetupJavaCompilation, CLASSLIST_JAR, \
     SMALL_JAVA := false, \
     SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/classlist, \
-    DISABLED_WARNINGS := dangling-doc-comments, \
+    DISABLED_WARNINGS := dangling-doc-comments suppression, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/classlist_classes, \
     JAR := $(SUPPORT_OUTPUTDIR)/classlist.jar, \
 ))

diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
@@ -51,7 +51,7 @@ JIMAGE_PKGS := \
 # ends up in the image, this will ensure reproducible classes
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
     COMPILER := interim, \
-    DISABLED_WARNINGS := options, \
+    DISABLED_WARNINGS := options suppression, \
     TARGET_RELEASE := $(TARGET_RELEASE_JDK8), \
     SRC := $(TOPDIR)/src/java.base/share/classes, \
     EXCLUDE_FILES := module-info.java, \

diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
@@ -258,6 +258,13 @@ define SetupJavaCompilationBody
       # If unspecified, default to the new jdk we're building
       $1_TARGET_RELEASE := $$(TARGET_RELEASE_NEWJDK)
     endif
+
+    # Always disable "suppression-option" because, thanks to the Depend plugin, we will
+    # only compile the source files that need to be recompiled, so the "suppression-option"
+    # lint warning can generate a false positive if some source file that would otherwise
+    # generate a suppressed lint warning is not included in the compilation. With a fresh
+    # build, it would be safe to enable "suppression-option" (TODO: automate doing that).
+    $1_FLAGS += -Xlint:-suppression-option
   else
     $$(error Invalid value for COMPILER in SetupJavaCompilation for $1: '$$($1_COMPILER)')
   endif

diff --git a/make/modules/java.base/Java.gmk b/make/modules/java.base/Java.gmk
@@ -28,8 +28,8 @@
 # The base module should be built with all warnings enabled. When a
 # new warning is added to javac, it can be temporarily added to the
 # disabled warnings list.
-#
-# DISABLED_WARNINGS_java +=
+
+DISABLED_WARNINGS_java += suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.desktop/Java.gmk b/make/modules/java.desktop/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments lossy-conversions this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments lossy-conversions this-escape suppression
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 COPY += .gif .png .wav .txt .xml .css .pf

diff --git a/make/modules/java.management/Java.gmk b/make/modules/java.management/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.naming/Java.gmk b/make/modules/java.naming/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.prefs/Java.gmk b/make/modules/java.prefs/Java.gmk
@@ -25,6 +25,8 @@
 
 ################################################################################
 
+DISABLED_WARNINGS_java += suppression
+
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'
 

diff --git a/make/modules/java.rmi/Java.gmk b/make/modules/java.rmi/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += this-escape suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.sql.rowset/Java.gmk b/make/modules/java.sql.rowset/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments
+DISABLED_WARNINGS_java += dangling-doc-comments suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.sql/Java.gmk b/make/modules/java.sql/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.xml.crypto/Java.gmk b/make/modules/java.xml.crypto/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape suppression
 
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:java.*,javax.*'

diff --git a/make/modules/java.xml/Java.gmk b/make/modules/java.xml/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments lossy-conversions this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments lossy-conversions this-escape suppression
 DOCLINT += -Xdoclint:all/protected \
     '-Xdoclint/package:$(call CommaList, javax.xml.catalog javax.xml.datatype \
     javax.xml.transform javax.xml.validation javax.xml.xpath)'

diff --git a/make/modules/jdk.attach/Java.gmk b/make/modules/jdk.attach/Java.gmk
@@ -0,0 +1,30 @@
+#
+# 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+
+DISABLED_WARNINGS_java += suppression
+
+################################################################################
diff --git a/make/modules/jdk.dynalink/Java.gmk b/make/modules/jdk.dynalink/Java.gmk
@@ -25,6 +25,8 @@
 
 ################################################################################
 
+DISABLED_WARNINGS_java += suppression
+
 CLEAN += .properties
 
 ################################################################################
diff --git a/make/modules/jdk.internal.le/Java.gmk b/make/modules/jdk.internal.le/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments this-escape
+DISABLED_WARNINGS_java += dangling-doc-comments this-escape suppression
 
 COPY += .properties .caps .txt
 

diff --git a/make/modules/jdk.jartool/Java.gmk b/make/modules/jdk.jartool/Java.gmk
@@ -25,6 +25,8 @@
 
 ################################################################################
 
+DISABLED_WARNINGS_java += suppression
+
 JAVAC_FLAGS += -XDstringConcat=inline
 
 ################################################################################
diff --git a/make/modules/jdk.jdeps/Java.gmk b/make/modules/jdk.jdeps/Java.gmk
@@ -25,6 +25,8 @@
 
 ################################################################################
 
+DISABLED_WARNINGS_java += suppression
+
 COPY += .txt
 
 CLEAN_FILES += $(wildcard \

diff --git a/make/modules/jdk.jfr/Java.gmk b/make/modules/jdk.jfr/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments exports
+DISABLED_WARNINGS_java += dangling-doc-comments exports suppression
 COPY := .xsd .xml .dtd .ini
 JAVAC_FLAGS := -XDstringConcat=inline
 

diff --git a/make/modules/jdk.jlink/Java.gmk b/make/modules/jdk.jlink/Java.gmk
@@ -29,4 +29,6 @@
 # upgrade_files_<module-name>.conf files
 COPY += .conf
 
+DISABLED_WARNINGS_java += suppression
+
 ################################################################################
diff --git a/make/modules/jdk.jpackage/Java.gmk b/make/modules/jdk.jpackage/Java.gmk
@@ -25,7 +25,7 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += dangling-doc-comments
+DISABLED_WARNINGS_java += dangling-doc-comments suppression
 
 COPY += .gif .png .txt .spec .script .prerm .preinst \
     .postrm .postinst .list .sh .desktop .copyright .control .plist .template \

diff --git a/make/modules/jdk.jshell/Java.gmk b/make/modules/jdk.jshell/Java.gmk
@@ -25,6 +25,8 @@
 
 ################################################################################
 
+DISABLED_WARNINGS_java += suppression
+
 COPY += .jsh .properties
 
 ################################################################################
diff --git a/make/modules/jdk.management.agent/Java.gmk b/make/modules/jdk.management.agent/Java.gmk
@@ -0,0 +1,30 @@
+#
+# 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+
+DISABLED_WARNINGS_java += suppression
+
+################################################################################
diff --git a/make/modules/jdk.management.jfr/Java.gmk b/make/modules/jdk.management.jfr/Java.gmk
@@ -0,0 +1,30 @@
+#
+# 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+
+DISABLED_WARNINGS_java += suppression
+
+################################################################################
diff --git a/make/modules/jdk.management/Java.gmk b/make/modules/jdk.management/Java.gmk
@@ -25,6 +25,6 @@
 
 ################################################################################
 
-DISABLED_WARNINGS_java += this-escape
+DISABLED_WARNINGS_java += this-escape suppression
 
 ################################################################################
diff --git a/make/modules/jdk.naming.rmi/Java.gmk b/make/modules/jdk.naming.rmi/Java.gmk
@@ -0,0 +1,30 @@
+#
+# 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.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+################################################################################
+
+DISABLED_WARNINGS_java += suppression
+
+################################################################################
diff --git a/make/test/BuildFailureHandler.gmk b/make/test/BuildFailureHandler.gmk
@@ -47,7 +47,7 @@ $(eval $(call SetupJavaCompilation, BUILD_FAILURE_HANDLER, \
     TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
     SRC := $(FH_BASEDIR)/src/share/classes $(FH_BASEDIR)/src/share/conf, \
     BIN := $(FH_SUPPORT)/classes, \
-    DISABLED_WARNINGS := options serial try this-escape, \
+    DISABLED_WARNINGS := options serial try this-escape suppression, \
     COPY := .properties, \
     CLASSPATH := $(JTREG_JAR) $(TOOLS_JAR), \
     JAR := $(FH_JAR), \

diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk
@@ -84,7 +84,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
     CLASSPATH := $(JMH_COMPILE_JARS), \
     CREATE_API_DIGEST := true, \
     DISABLED_WARNINGS := restricted this-escape processing rawtypes removal cast \
-        serial preview dangling-doc-comments, \
+        serial preview dangling-doc-comments suppression, \
     SRC := $(MICROBENCHMARK_SRC), \
     BIN := $(MICROBENCHMARK_CLASSES), \
     JAVAC_FLAGS := \

diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
@@ -63,6 +63,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
     BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
     HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
     JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
+    DISABLED_WARNINGS := suppression, \
     JAVAC_FLAGS := --add-exports java.base/sun.security.util=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \

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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -412,6 +412,7 @@ public void process(Env<AttrContext> env) {
                 f.run(compiler.todo, classes);
             }
         } finally {
+            compiler.log.reportOutstandingWarnings();
             compiler.log.flush();
         }
         return results;
@@ -483,8 +484,10 @@ public void process(Env<AttrContext> env) {
             }
         }
         finally {
-            if (compiler != null)
+            if (compiler != null) {
+                compiler.log.reportOutstandingWarnings();
                 compiler.log.flush();
+            }
         }
         return results;
     }