Don't crash on an "empty" method with a redundant return.

PiperOrigin-RevId: 450727959
google · May 24, 2022 · 81acea9 · 81acea9
1 parent 464b218
commit 81acea9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.../src/main/java/com/google/errorprone/bugpatterns/UnsynchronizedOverridesSynchronized.java b/.../src/main/java/com/google/errorprone/bugpatterns/UnsynchronizedOverridesSynchronized.java
@@ -121,7 +121,8 @@ public Boolean visitBlock(BlockTree tree, Void unused) {
           @Override
           public Boolean visitReturn(ReturnTree tree, Void unused) {
             ExpressionTree expression = tree.getExpression();
-            if (constantExpressions.constantExpression(expression, state).isPresent()) {
+            if (expression == null
+                || constantExpressions.constantExpression(expression, state).isPresent()) {
               return true;
             }
             return scan(tree.getExpression(), null);

diff --git a/.../test/java/com/google/errorprone/bugpatterns/UnsynchronizedOverridesSynchronizedTest.java b/.../test/java/com/google/errorprone/bugpatterns/UnsynchronizedOverridesSynchronizedTest.java
@@ -157,6 +157,11 @@ public void ignoreEmptyOverride() {
             "      super.f();",
             "    }",
             "  }",
+            "  class D extends Lib {",
+            "    public void f() {",
+            "      return;",
+            "    }",
+            "  }",
             "}")
         .doTest();
   }