Fix some crashes involving records

Fixes #2324, #2323, #2322 PiperOrigin-RevId: 373431735
google · May 12, 2021 · de28b3e · de28b3e
1 parent cafdc69
commit de28b3e
Show file tree

Hide file tree

Showing 7 changed files with 79 additions and 1 deletion.
diff --git a/check_api/src/main/java/com/google/errorprone/matchers/Matchers.java b/check_api/src/main/java/com/google/errorprone/matchers/Matchers.java
@@ -1311,11 +1311,15 @@ public static Matcher<Tree> hasAnyAnnotation(List<? extends TypeMirror> mirrors)
   private static final ImmutableSet<Kind> DECLARATION =
       Sets.immutableEnumSet(Kind.LAMBDA_EXPRESSION, Kind.CLASS, Kind.ENUM, Kind.INTERFACE);
 
+  private static boolean isDeclaration(Kind kind) {
+    return DECLARATION.contains(kind) || kind.name().equals("RECORD");
+  }
+
   public static boolean methodCallInDeclarationOfThrowingRunnable(VisitorState state) {
     return stream(state.getPath())
         // Find the nearest definitional context for this method invocation
         // (i.e.: the nearest surrounding class or lambda)
-        .filter(t -> DECLARATION.contains(t.getKind()))
+        .filter(t -> isDeclaration(t.getKind()))
         .findFirst()
         .map(t -> isThrowingFunctionalInterface(getType(t), state))
         .orElseThrow(VerifyException::new);

diff --git a/check_api/src/main/java/com/google/errorprone/util/RuntimeVersion.java b/check_api/src/main/java/com/google/errorprone/util/RuntimeVersion.java
@@ -85,6 +85,11 @@ public static boolean isAtLeast15() {
     return MAJOR >= 15;
   }
 
+  /** Returns true if the current runtime is JDK 16 or newer. */
+  public static boolean isAtLeast16() {
+    return MAJOR >= 16;
+  }
+
   /**
    * Returns the latest {@code --release} version.
    *

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/PrivateConstructorForUtilityClass.java b/core/src/main/java/com/google/errorprone/bugpatterns/PrivateConstructorForUtilityClass.java
@@ -107,6 +107,9 @@ private static boolean isInstance(Tree tree) {
       case INTERFACE:
         return false;
       default:
+        if (tree.getKind().name().equals("RECORD")) {
+          return false;
+        }
         throw new AssertionError("unknown member type:" + tree.getKind());
     }
   }

diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ThreadSafety.java b/core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/ThreadSafety.java
@@ -562,6 +562,9 @@ public Violation visitType(Type type, Void s) {
         case CLASS:
           break;
         default:
+          if (type.tsym.getKind().name().equals("RECORD")) {
+            break;
+          }
           throw new AssertionError(String.format("Unexpected type kind %s", type.tsym.getKind()));
       }
       if (WellKnownMutability.isAnnotation(state, type)) {

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/FieldCanBeStaticTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/FieldCanBeStaticTest.java
@@ -16,9 +16,12 @@
 
 package com.google.errorprone.bugpatterns;
 
+import static org.junit.Assume.assumeTrue;
+
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.CompilationTestHelper;
 import com.google.errorprone.ErrorProneFlags;
+import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -286,4 +289,24 @@ public void inner() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void record() {
+    assumeTrue(RuntimeVersion.isAtLeast15());
+    compilationHelper
+        .addSourceLines(
+            "ExampleClass.java",
+            "package example;",
+            "public final class ExampleClass {",
+            "  public record OtherRecord(String value) {}",
+            "  public record SomeRecord(OtherRecord value) {",
+            "    public static SomeRecord fromValue(final OtherRecord value) {",
+            "      return new SomeRecord(value);",
+            "    }",
+            "  }",
+            "  private ExampleClass() {",
+            "  }",
+            "}")
+        .doTest();
+  }
 }
diff --git a/...rc/test/java/com/google/errorprone/bugpatterns/PrivateConstructorForUtilityClassTest.java b/...rc/test/java/com/google/errorprone/bugpatterns/PrivateConstructorForUtilityClassTest.java
@@ -15,8 +15,11 @@
  */
 package com.google.errorprone.bugpatterns;
 
+import static org.junit.Assume.assumeTrue;
+
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.CompilationTestHelper;
+import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -345,4 +348,18 @@ public void abstractClass_noPrivateConstructor() {
         .expectUnchanged()
         .doTest();
   }
+
+  @Test
+  public void record() {
+    assumeTrue(RuntimeVersion.isAtLeast15());
+    testHelper
+        .addInputLines(
+            "ExampleUtilityClass.java",
+            "package example;",
+            "public final class ExampleUtilityClass {",
+            "  public record SomeRecord(String value) {}",
+            "}")
+        .expectUnchanged()
+        .doTest();
+  }
 }
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/StreamResourceLeakTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/StreamResourceLeakTest.java
@@ -16,9 +16,12 @@
 
 package com.google.errorprone.bugpatterns;
 
+import static org.junit.Assume.assumeTrue;
+
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
 import com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode;
 import com.google.errorprone.CompilationTestHelper;
+import com.google.errorprone.util.RuntimeVersion;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -285,4 +288,24 @@ public void defaultMethod() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void record() {
+    assumeTrue(RuntimeVersion.isAtLeast15());
+    testHelper
+        .addSourceLines(
+            "ExampleRecord.java",
+            "package example;",
+            "import java.io.IOException;",
+            "import java.nio.file.Files;",
+            "import java.nio.file.Path;",
+            "import java.util.stream.Stream;",
+            "record ExampleRecord(Path path) {",
+            "  public Stream<Path> list() throws IOException {",
+            "    // BUG: Diagnostic contains: should be closed",
+            "    return Files.list(path);",
+            "  }",
+            "}")
+        .doTest();
+  }
 }