8348611: Eliminate DeferredLintHandler and emit warnings after attribution

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;
     }

src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTaskPool.java

@@ -55,6 +55,7 @@
 import com.sun.source.util.TaskListener;
 import com.sun.source.util.TreeScanner;
 import com.sun.tools.javac.code.Kinds;
+import com.sun.tools.javac.code.LintMapper;
 import com.sun.tools.javac.code.Preview;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symtab;
@@ -268,6 +269,7 @@ void clear() {
             if (ht.get(Log.logKey) instanceof ReusableLog) {
                 //log already inited - not first round
                 Log.instance(this).clear();
+                LintMapper.instance(this).clear();
                 Enter.instance(this).newRound();
                 ((ReusableJavaCompiler)ReusableJavaCompiler.instance(this)).clear();
                 Types.instance(this).newRound();

src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTrees.java

@@ -360,9 +360,14 @@ public TypeMirror getType(DocTreePath path) {
                 Log.DeferredDiagnosticHandler deferredDiagnosticHandler = log.new DeferredDiagnosticHandler();
                 try {
                     Env<AttrContext> env = getAttrContext(path.getTreePath());
-                    Type t = attr.attribType(dcReference.qualifierExpression, env);
-                    if (t != null && !t.isErroneous()) {
-                        return t;
+                    JavaFileObject prevSource = log.useSource(env.toplevel.sourcefile);
+                    try {
+                        Type t = attr.attribType(dcReference.qualifierExpression, env);
+                        if (t != null && !t.isErroneous()) {
+                            return t;
+                        }
+                    } finally {
+                        log.useSource(prevSource);
                     }
                 } catch (Abort e) { // may be thrown by Check.completionError in case of bad class file
                     return null;
@@ -388,6 +393,7 @@ private Symbol attributeDocReference(TreePath path, DCReference ref) {
             return null;
         }
         Log.DeferredDiagnosticHandler deferredDiagnosticHandler = log.new DeferredDiagnosticHandler();
+        JavaFileObject prevSource = log.useSource(env.toplevel.sourcefile);
         try {
             final TypeSymbol tsym;
             final Name memberName;
@@ -509,6 +515,7 @@ private Symbol attributeDocReference(TreePath path, DCReference ref) {
         } catch (Abort e) { // may be thrown by Check.completionError in case of bad class file
             return null;
         } finally {
+            log.useSource(prevSource);
             log.popDiagnosticHandler(deferredDiagnosticHandler);
         }
     }

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java

@@ -374,11 +374,8 @@ public enum LintCategory {
 
         /**
          * Warn about issues relating to use of text blocks
-         *
-         * <p>
-         * This category is not supported by {@code @SuppressWarnings} (yet - see JDK-8224228).
          */
-        TEXT_BLOCKS("text-blocks", false),
+        TEXT_BLOCKS("text-blocks"),
 
         /**
          * Warn about possible 'this' escapes before subclass instance is fully initialized.
@@ -476,27 +473,6 @@ public boolean isSuppressed(LintCategory lc) {
         return suppressedValues.contains(lc);
     }
 
-    /**
-     * Helper method. Log a lint warning if its lint category is enabled.
-     *
-     * @param warning key for the localized warning message
-     */
-    public void logIfEnabled(LintWarning warning) {
-        logIfEnabled(null, warning);
-    }
-
-    /**
-     * Helper method. Log a lint warning if its lint category is enabled.
-     *
-     * @param pos source position at which to report the warning
-     * @param warning key for the localized warning message
-     */
-    public void logIfEnabled(DiagnosticPosition pos, LintWarning warning) {
-        if (isEnabled(warning.getLintCategory())) {
-            log.warning(pos, warning);
-        }
-    }
-
     /**
      * Obtain the set of recognized lint warning categories suppressed at the given symbol's declaration.
      *