Don't scan into nested enums in ClassInitializationDeadlock

cushon · Error Prone Team · commit 6a8f4936b20e · 2024-04-30T10:17:33.000-07:00
#4378 PiperOrigin-RevId: 629452163
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/ClassInitializationDeadlock.java b/core/src/main/java/com/google/errorprone/bugpatterns/ClassInitializationDeadlock.java
@@ -71,7 +71,7 @@ public Description matchClass(ClassTree tree, VisitorState state) {
       @Override
       public Void visitClass(ClassTree node, Void unused) {
         for (Tree member : node.getMembers()) {
-          if (member.getKind().equals(Tree.Kind.CLASS)) {
+          if (member instanceof ClassTree) {
             continue;
           }
           scan(member, null);
diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/ClassInitializationDeadlockTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/ClassInitializationDeadlockTest.java
@@ -266,4 +266,34 @@ public void negativeNonPrivateUnrelatedSuper() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void nestedEnum() {
+    testHelper
+        .addSourceLines(
+            "TestInterface.java", //
+            "public interface TestInterface {",
+            "  default Object foo() {",
+            "    return null;",
+            "  }",
+            "  enum TestEnum implements TestInterface {",
+            "    INSTANCE;",
+            "  }",
+            "}")
+        .doTest();
+  }
+
+  @Test
+  public void nestedInterface() {
+    testHelper
+        .addSourceLines(
+            "Foo.java", //
+            "interface Foo {",
+            "  default void foo() {}",
+            "  interface Sub extends Foo {",
+            "    final Sub INSTANCE = new Sub() {};",
+            "  }",
+            "}")
+        .doTest();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public Description matchClass(ClassTree tree, VisitorState state) {`
`71`	`71`	`@Override`
`72`	`72`	`public Void visitClass(ClassTree node, Void unused) {`
`73`	`73`	`for (Tree member : node.getMembers()) {`
`74`		`- if (member.getKind().equals(Tree.Kind.CLASS)) {`
	`74`	`+ if (member instanceof ClassTree) {`
`75`	`75`	`continue;`
`76`	`76`	`}`
`77`	`77`	`scan(member, null);`