Merge branch 'master' into warn-on-unneeded-suppressions

Author: msridhar

.github/workflows/ci.yml

@@ -58,18 +58,18 @@ jobs:
           java-version: 17
           distribution: 'zulu'
           cache: 'maven'
-      - name: 'Set up JDK 23'
-        uses: actions/setup-java@v4
-        with:
-          java-version: 23
-          distribution: 'zulu'
-          cache: 'maven'
       - name: 'Set up JDK 25 from jdk.java.net'
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
           release: 25
           cache: 'maven'
+      - name: 'Set up JDK 26 from jdk.java.net'
+        uses: oracle-actions/setup-java@v1
+        with:
+          website: jdk.java.net
+          release: 26
+          cache: 'maven'
       - name: 'Set up JDK ${{ matrix.java }} from jdk.java.net'
         if: ${{ matrix.java == 'EA' }}
         uses: oracle-actions/setup-java@v1
@@ -108,19 +108,13 @@ jobs:
           website: jdk.java.net
           release: 25
           cache: 'maven'
-      - name: 'Set up JDK 23'
-        uses: actions/setup-java@v4
-        with:
-          java-version: 23
-          distribution: 'zulu'
-          cache: 'maven'
       - name: 'Set up JDK 17'
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
           cache: 'maven'
-          server-id: ossrh
+          server-id: sonatype-nexus-snapshots
           server-username: CI_DEPLOY_USERNAME
           server-password: CI_DEPLOY_PASSWORD
       - name: 'Publish'

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
           java-version: 17
           distribution: 'zulu'
           cache: 'maven'
-          server-id: ossrh
+          server-id: central
           server-username: CI_DEPLOY_USERNAME
           server-password: CI_DEPLOY_PASSWORD
           gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}

README.md

@@ -31,8 +31,9 @@ Our documentation is at [errorprone.info](https://errorprone.info).
 
 Error Prone works with [Bazel](https://bazel.build),
 [Maven](https://maven.apache.org), [Ant](https://ant.apache.org), and
-[Gradle](https://gradle.org). See our [installation
-instructions](https://errorprone.info/docs/installation) for details.
+[Gradle](https://gradle.org). See our
+[installation instructions](https://errorprone.info/docs/installation) for
+details.
 
 ## Developing Error Prone
 
@@ -42,9 +43,8 @@ Developing and building Error Prone is documented on the
 ## Links
 
 -   Mailing lists
-    -   [General
-        discussion](https://groups.google.com/forum/#!forum/error-prone-discuss)
+    -   [General discussion](https://groups.google.com/forum/#!forum/error-prone-discuss)
     -   [Announcements](https://groups.google.com/forum/#!forum/error-prone-announce)
 -   [Javadoc](https://errorprone.info/api/latest/)
--   Pre-release snapshots are available from [Sonatype's snapshot
-    repository](https://oss.sonatype.org/content/repositories/snapshots/com/google/errorprone/).
+-   Pre-release snapshots are available from Sonatype's snapshot repository
+    (https://central.sonatype.com/repository/maven-snapshots/)

annotations/src/main/java/com/google/errorprone/annotations/CompileTimeConstant.java

@@ -41,6 +41,8 @@
  *   <li>the expression is a {@link String}, and formed from the concatenation of symbols which meet
  *       these conditions, or
  *   <li>the expression is a ternary condition, where both branches satisfy these conditions, or
+ *   <li>the expression is a switch expression, where every case is either a constant expression or
+ *       throws, or
  *   <li>the expression is an immutable collection with all values known to satisfy these conditions
  *       (for example, {@code ImmutableSet.of("a", "b", "c")}).
  * </ol>

check_api/src/main/java/com/google/errorprone/JavacErrorDescriptionListener.java

@@ -32,6 +32,7 @@
 import com.sun.tools.javac.util.Log;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -119,7 +120,8 @@ public void onDescribed(Description description) {
           factory.create(
               type,
               /* lintCategory */ null,
-              DIAGNOSTIC_FLAGS,
+              // Make a defensive copy, as JDK at head mutates its arguments.
+              EnumSet.copyOf(DIAGNOSTIC_FLAGS),
               log.currentSource(),
               pos,
               MESSAGE_BUNDLE_KEY,

check_api/src/main/java/com/google/errorprone/dataflow/nullnesspropagation/NullnessAnnotations.java

@@ -74,15 +74,20 @@ public static Optional<Nullness> fromAnnotationMirrors(
 
   public static boolean annotationsAreAmbiguous(
       Collection<? extends AnnotationMirror> annotations) {
-    return annotations.stream()
-            .map(a -> simpleName(a).toString())
-            .filter(ANNOTATION_RELEVANT_TO_NULLNESS)
-            .map(NULLABLE_ANNOTATION::test)
+    return annotationsRelevantToNullness(annotations).stream()
+            .map(a -> NULLABLE_ANNOTATION.test(simpleName(a).toString()))
             .distinct()
             .count()
         == 2;
   }
 
+  public static ImmutableList<AnnotationMirror> annotationsRelevantToNullness(
+      Collection<? extends AnnotationMirror> annotations) {
+    return annotations.stream()
+        .filter(a -> ANNOTATION_RELEVANT_TO_NULLNESS.test(simpleName(a).toString()))
+        .collect(toImmutableList());
+  }
+
   public static ImmutableList<AnnotationTree> annotationsRelevantToNullness(
       List<? extends AnnotationTree> annotations) {
     return annotations.stream()

check_api/src/main/java/com/google/errorprone/matchers/CompileTimeConstantExpressionMatcher.java

@@ -30,11 +30,14 @@
 import com.google.errorprone.annotations.CompileTimeConstant;
 import com.google.errorprone.suppliers.Supplier;
 import com.sun.source.tree.BinaryTree;
+import com.sun.source.tree.CaseTree.CaseKind;
 import com.sun.source.tree.ConditionalExpressionTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.IdentifierTree;
 import com.sun.source.tree.MethodInvocationTree;
 import com.sun.source.tree.ParenthesizedTree;
+import com.sun.source.tree.SwitchExpressionTree;
+import com.sun.source.tree.ThrowTree;
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.Tree.Kind;
 import com.sun.source.tree.TypeCastTree;
@@ -102,6 +105,17 @@ public Boolean visitConditionalExpression(ConditionalExpressionTree tree, Void u
                   && tree.getFalseExpression().accept(this, null);
             }
 
+            @Override
+            public Boolean visitSwitchExpression(SwitchExpressionTree tree, Void unused) {
+              // This is intentionally quite restrictive: only accept bare values and throws.
+              return tree.getCases().stream()
+                  .allMatch(
+                      c ->
+                          c.getCaseKind().equals(CaseKind.RULE)
+                              && (c.getBody().accept(this, null)
+                                  || c.getBody() instanceof ThrowTree));
+            }
+
             @Override
             public Boolean visitMethodInvocation(MethodInvocationTree tree, Void unused) {
               return IMMUTABLE_FACTORY.matches(tree, state)

check_api/src/main/java/com/google/errorprone/matchers/Description.java

@@ -143,9 +143,7 @@ public Description applySeverityOverride(SeverityLevel severity) {
       explanation = "Use describeMatch or buildDescription on BugChecker instead.",
       link = "",
       allowedOnPath =
-          ".*/java/com/google/devtools/staticanalysis/errorprone/pluggabletype/LatticeAdapter.java"
-              + "|.*/java/com/google/devtools/staticanalysis/errorprone/pluggabletype/LatticeInfo.java"
-              + "|.*/third_party/java_src/error_prone/project/check_api/src/main/java/com/google/errorprone/bugpatterns/BugChecker.java")
+          ".*/third_party/java_src/error_prone/project/check_api/src/main/java/com/google/errorprone/bugpatterns/BugChecker.java")
   public static Builder builder(Tree node, String name, @Nullable String link, String message) {
     return new Builder((DiagnosticPosition) node, name, link, message);
   }
@@ -270,7 +268,6 @@ public Builder setLinkUrl(String linkUrl) {
             ".*/third_party/java_src/error_prone/project/check_api/src/main/java/com/google/errorprone/matchers/Description.java$|"
                 + ".*/java/com/google/devtools/javatools/staticanalysis/xlang/java/BugCheckerUsingXlang.java$|"
                 + ".*/java/com/google/devtools/staticanalysis/errorprone/RestrictedInheritanceChecker.java$|"
-                + ".*/java/com/google/devtools/staticanalysis/errorprone/pluggabletype/LatticeAdapter.java$|"
                 + ".*/third_party/java_src/error_prone/project/core/src/main/java/com/google/errorprone/bugpatterns/RestrictedApiChecker.java$|"
                 + ".*/third_party/java_src/error_prone/project/core/src/main/java/com/google/errorprone/refaster/RefasterScanner.java$")
     @CanIgnoreReturnValue

check_api/src/main/java/com/google/errorprone/matchers/InjectMatchers.java

@@ -33,10 +33,7 @@
 public final class InjectMatchers {
 
   public static final Matcher<Tree> INSIDE_GUICE_MODULE =
-      enclosingClass(
-          anyOf(
-              isSubtypeOf("com.google.inject.Module"),
-              isSubtypeOf("com.google.gwt.inject.client.GinModule")));
+      enclosingClass(isSubtypeOf("com.google.inject.Module"));
 
   private InjectMatchers() {} // no instantiation
 

check_api/src/main/java/com/google/errorprone/util/ASTHelpers.java

@@ -20,7 +20,6 @@
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.collect.Streams.stream;
 import static com.google.common.collect.Streams.zip;
@@ -1057,13 +1056,9 @@ public static boolean hasDirectAnnotationWithSimpleName(Tree tree, String simple
   }
 
   /**
-   * Returns true if any of the given tree is a declaration annotated with an annotation with the
-   * simple name {@code @UsedReflectively} or {@code @Keep}, or any annotations meta-annotated with
-   * an annotation with that simple name.
-   *
-   * <p>This indicates the annotated element is used (e.g. by reflection, or referenced by generated
-   * code) and should not be removed.
+   * @deprecated use {@code @com.google.errorprone.bugpatterns.WellKnownKeep} instead.
    */
+  @Deprecated
   public static boolean shouldKeep(Tree tree) {
     ModifiersTree modifiers = getModifiers(tree);
     if (modifiers == null) {
@@ -2012,9 +2007,23 @@ public static boolean isAbstract(MethodSymbol method) {
     return method.getModifiers().contains(Modifier.ABSTRACT);
   }
 
-  public static EnumSet<Flags.Flag> asFlagSet(long flags) {
+  /**
+   * Returns a set of strings representing the flags in the given long. This uses the bit encoding
+   * from {@link Flags}.
+   *
+   * @return a set of strings representing the flags in the given long, in lowercase. Elements of
+   *     the set are strings like "static" or "final".
+   */
+  public static ImmutableSet<String> asFlagSet(long flags) {
     flags &= ~(Flags.ANONCONSTR_BASED | POTENTIALLY_AMBIGUOUS);
-    return Flags.asFlagSet(flags);
+    // The cast to EnumSet<?> is because Flags.asFlagSet() returns an EnumSet<Flags.Flag> in some
+    // versions of JDK, and an EnumSet<FlagsEnum> in others. Without the cast, whichever enum type
+    // it is gets referenced by the stream, so the code won't work if compiled with a JDK that has
+    // the change and executed with one that doesn't, or vice versa. Erasure means that the call to
+    // Flags.asFlagSet doesn't itself cause problems because EnumSet<Flags.Flag> gets erased to just
+    // EnumSet in the bytecode.
+    return ((EnumSet<?>) Flags.asFlagSet(flags))
+        .stream().map(Object::toString).collect(toImmutableSet());
   }
 
   // Removed in JDK 21 by JDK-8026369
@@ -2111,12 +2120,15 @@ private void scan(Type from, Type to) {
 
   /** Returns whether this is a {@code var} or a lambda parameter that has no explicit type. */
   public static boolean hasImplicitType(VariableTree tree, VisitorState state) {
-    /*
-     * For lambda expression parameters without an explicit type, both
-     * `JCVariableDecl#declaredUsingVar()` and `#isImplicitlyTyped()` may be false. So instead we
-     * check whether the variable's type is explicitly represented in the source code.
-     */
-    return !hasExplicitSource(tree.getType(), state);
+    JCVariableDecl varDecl = (JCVariableDecl) tree;
+    if (varDecl.declaredUsingVar()) {
+      return true;
+    }
+    // after JDK-8358604, inferred variable types have source positions
+    if (!hasExplicitSource(tree.getType(), state)) {
+      return true;
+    }
+    return false;
   }
 
   /** Returns whether the given tree has an explicit source code representation. */
@@ -2184,16 +2196,18 @@ public static Optional<? extends CaseTree> getSwitchDefault(SwitchTree switchTre
     return switchTree.getCases().stream().filter(c -> isSwitchDefault(c)).findFirst();
   }
 
-  /** Returns whether {@code caseTree} is the default case of a switch statement. */
+  /**
+   * Returns whether {@code caseTree} is the default case of a switch statement. This includes
+   * {@code case null, default ->}.
+   */
   public static boolean isSwitchDefault(CaseTree caseTree) {
-    if (!caseTree.getExpressions().isEmpty()) {
+    List<? extends Tree> labels = caseTree.getLabels();
+    if (!caseTree.getExpressions().isEmpty() && labels.isEmpty()) {
       return false;
     }
-    List<? extends Tree> labels = caseTree.getLabels();
     return labels.isEmpty()
-        || (labels.size() == 1
-            // DEFAULT_CASE_LABEL is in Java 21, so we're stuck stringifying for now.
-            && getOnlyElement(labels).getKind().name().equals("DEFAULT_CASE_LABEL"));
+        // DEFAULT_CASE_LABEL is in Java 21, so we're stuck stringifying for now.
+        || labels.stream().anyMatch(label -> label.getKind().name().equals("DEFAULT_CASE_LABEL"));
   }
 
   private static final Supplier<Name> NULL_MARKED_NAME =