Skip to content

Don't log speculative parse errors when resolving @GuardedBy expressions #5456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jan 21, 2026
+25 −0
Merged

Don't log speculative parse errors when resolving @GuardedBy expressions #5456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static com.google.errorprone.util.ASTHelpers.getSymbol;
import static com.google.errorprone.util.ASTHelpers.isStatic;
import static com.google.errorprone.util.ErrorProneLog.deferredDiagnosticHandler;

import com.google.common.collect.ImmutableSet;
import com.google.errorprone.VisitorState;
Expand All @@ -31,6 +32,7 @@
import com.sun.tools.javac.parser.ParserFactory;
import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Log;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -80,11 +82,15 @@ static JCTree.JCExpression parseString(String guardedByString, Context context)
/* keepDocComments= */ false,
/* keepEndPos= */ true,
/* keepLineMap= */ false);
Log log = Log.instance(context);
Log.DeferredDiagnosticHandler deferredDiagnosticHandler = deferredDiagnosticHandler(log);
JCTree.JCExpression exp;
try {
exp = parser.parseExpression();
} catch (RuntimeException e) {
throw new IllegalGuardedBy(e.getMessage());
} finally {
log.popDiagnosticHandler(deferredDiagnosticHandler);
}
int len = (parser.getEndPos(exp) - exp.getStartPosition());
if (len != guardedByString.length()) {
Expand Down
19 changes: 19 additions & 0 deletions core/src/test/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByCheckerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2511,4 +2511,23 @@ public static void t(I other) {
""")
.doTest();
}

@Test
public void parseError() {
compilationHelper
.addSourceLines(
"IllegalStartOfExpression.java",
"""
package example;

import com.google.errorprone.annotations.concurrent.GuardedBy;

public class IllegalStartOfExpression {
@GuardedBy("itself (synchronized blocks)")
// BUG: Diagnostic contains: could not resolve
int field;
}
""")
.doTest();
}
}
Loading