Don't check synchronized blocks within unannotated code (#1185)

msridhar · web-flow · commit 059b90bd3b61 · 2025-04-02T13:07:25.000-07:00
Fixes #1184 We forgot to add the standard check for unannotated code to `matchSynchronized`
diff --git a/nullaway/src/main/java/com/uber/nullaway/NullAway.java b/nullaway/src/main/java/com/uber/nullaway/NullAway.java
@@ -1798,6 +1798,9 @@ public Description matchEnhancedForLoop(EnhancedForLoopTree tree, VisitorState s
 
   @Override
   public Description matchSynchronized(SynchronizedTree tree, VisitorState state) {
+    if (!withinAnnotatedCode(state)) {
+      return Description.NO_MATCH;
+    }
     ExpressionTree lockExpr = tree.getExpression();
     // For a synchronized block `synchronized (e) { ... }`, javac returns `(e)` as the expression.
     // We strip the outermost parentheses for a nicer-looking error message.
diff --git a/nullaway/src/test/java/com/uber/nullaway/CoreTests.java b/nullaway/src/test/java/com/uber/nullaway/CoreTests.java
@@ -1118,4 +1118,20 @@ public void synchronizedDeref() {
             "}")
         .doTest();
   }
+
+  @Test
+  public void synchronizedInUnannotatedLambda() {
+    defaultCompilationHelper
+        .addSourceLines(
+            "Foo.java",
+            "public class Foo {",
+            "    void foo() {",
+            "        Runnable runnable = () -> {",
+            "            Object lock = new Object();",
+            "            synchronized (lock) {}",
+            "        };",
+            "    }",
+            "}")
+        .doTest();
+  }
 }
