Skip to content
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
158e737
Suppresses RLC non-final field overwrite warning for safe constructor…
iamsanjaymalakar Apr 18, 2025
325e983
Add `@FindDistinct` annotation
mernst Apr 18, 2025
4cb90d7
Resolves PR review comments.
iamsanjaymalakar Apr 22, 2025
9d4d403
Merge branch 'master' into 7049-dev
iamsanjaymalakar Jun 13, 2025
c524542
Addresses PR comments.
iamsanjaymalakar Jun 13, 2025
a9a1e84
Merge ../checker-framework-branch-master into 7049-dev
mernst Jul 10, 2025
dbd6447
Merge branch 'master' into 7049-dev
iamsanjaymalakar Jul 14, 2025
29071ca
Merge branch '7049-dev' of github.com:iamsanjaymalakar/checker-framew…
mernst Jul 14, 2025
14aebc4
Merge ../checker-framework-branch-master into 7049-dev
mernst Jul 14, 2025
87b838c
Punctuation
mernst Jul 14, 2025
8ad095b
Improve comments
mernst Jul 14, 2025
fa2aef4
Tweak coment and code
mernst Jul 14, 2025
96c47f8
Better comments.
iamsanjaymalakar Jul 15, 2025
9a70147
Merge ../checker-framework-branch-master into 7049-dev
mernst Jul 20, 2025
4010022
Add test showing error message at wrong location
mernst Jul 20, 2025
4765ecf
Comments and variable name
mernst Jul 20, 2025
143f3f4
Enhance test
mernst Jul 20, 2025
b11cd19
Merge ../checker-framework-branch-master into 7049-dev
mernst Jul 21, 2025
dda12eb
Merge branch 'master' into 7049-dev
iamsanjaymalakar Aug 30, 2025
d78354e
Merge branch 'master' into 7049-dev
iamsanjaymalakar Oct 4, 2025
81c8cab
Resolves PR comments. Mike's new test is passing now.
iamsanjaymalakar Oct 7, 2025
f3b9022
Merge ../checker-framework-branch-master into 7049-dev
mernst Oct 9, 2025
0d53a06
Merge ../checker-framework-branch-master into 7049-dev
mernst Oct 10, 2025
07617a7
Improve documentation and naming
mernst Oct 10, 2025
c188d0f
Naming
mernst Oct 10, 2025
7f4360a
Add tests
mernst Oct 10, 2025
7eb84c4
Addresses Mike's review comments. Adds test.
iamsanjaymalakar Oct 11, 2025
827e573
Merge branch 'master' into 7049-dev
iamsanjaymalakar Oct 11, 2025
80d52c2
Replaces == with equals.
iamsanjaymalakar Oct 11, 2025
a5d1f60
Method call in instance initializer block.
iamsanjaymalakar Oct 11, 2025
786d477
Update checker/tests/resourceleak-firstinitconstructor/InstanceInitia…
mernst Oct 12, 2025
5d9d51a
Merge ../checker-framework-branch-master into 7049-dev
mernst Oct 12, 2025
46687a1
Expand tests
mernst Oct 12, 2025
679cbdf
Merge branch '7049-dev' of github.com:iamsanjaymalakar/checker-framew…
mernst Oct 12, 2025
000a833
Fix spelling
mernst Oct 12, 2025
2d9e299
More tests
mernst Oct 12, 2025
d55afd1
Side effecting constructor calls that may rewrite field. Updates tests.
iamsanjaymalakar Oct 17, 2025
93210dd
Reverts == with .equals due to interning:not.interned error.
iamsanjaymalakar Oct 17, 2025
04d72ba
Merge branch 'master' into 7049-dev
iamsanjaymalakar Oct 17, 2025
2d1691a
Merge branch 'master' into 7049-dev
msridhar Jan 5, 2026
43490e6
Nullness checker errors from azure build pipeline.
iamsanjaymalakar Jan 6, 2026
2429215
Nullness checker errors from azure build pipeline.
iamsanjaymalakar Jan 6, 2026
33f4adf
Nullness checker errors from azure build pipeline.
iamsanjaymalakar Jan 6, 2026
caa85b1
Merge ../checker-framework-branch-master into 7049-dev
mernst Jan 21, 2026
a7eb9a8
Documentation edits
mernst Jan 22, 2026
df08e91
Complete the method renaming
mernst Jan 22, 2026
a891075
Removes a redundant null check.
iamsanjaymalakar Jan 22, 2026
f74552f
Merge branch 'master' into 7049-dev
iamsanjaymalakar Jan 24, 2026
17468f6
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 2, 2026
9bd6d38
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 4, 2026
aa0e9e9
Makes the scanner more conservative.
iamsanjaymalakar Feb 5, 2026
4d93d90
Suppresses interning checker warning.
iamsanjaymalakar Feb 5, 2026
b6a6daf
Fixes typo.
iamsanjaymalakar Feb 5, 2026
48ea240
Merge branch 'master' into 7049-dev
iamsanjaymalakar Feb 5, 2026
219c5b5
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 6, 2026
7b7f3f9
Adds object allocation side effect check for inline initializer block.
iamsanjaymalakar Feb 6, 2026
1d0fdae
Coderabbit suggestions.
iamsanjaymalakar Feb 6, 2026
11ebf6c
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 9, 2026
705019a
Tweaks
mernst Feb 9, 2026
80f0d1f
Merge branch '7049-dev' of github.com:iamsanjaymalakar/checker-framew…
mernst Feb 9, 2026
6aa49ee
Simplify wording
mernst Feb 9, 2026
efc7b7c
Remove warning suppressions
mernst Feb 9, 2026
af3ca85
Brevity
mernst Feb 9, 2026
80e4041
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 9, 2026
ece1b44
Merge branch 'master' into 7049-dev
iamsanjaymalakar Feb 10, 2026
6c806fb
Merge branch 'master' into 7049-dev
iamsanjaymalakar Feb 11, 2026
b9af79d
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 20, 2026
6a3e7d0
Merge ../checker-framework-branch-master into 7049-dev
mernst Feb 27, 2026
52f6d69
Merge ../checker-framework-branch-master into 7049-dev
mernst Mar 2, 2026
869bb89
Merge ../checker-framework-branch-master into 7049-dev
mernst Mar 2, 2026
57985ba
Put error key in brackets
mernst Mar 2, 2026
481e926
Merge ../checker-framework-fork-mernst-branch-more-square-brackets in…
mernst Mar 2, 2026
4babfbd
Put error key in brackets
mernst Mar 2, 2026
7668ccc
Undo a change
mernst Mar 2, 2026
cb5f029
Another pair of brackets
mernst Mar 2, 2026
7305395
Merge ../checker-framework-fork-mernst-branch-more-square-brackets in…
mernst Mar 2, 2026
224f485
Merge ../checker-framework-branch-master into more-square-brackets
mernst Mar 3, 2026
775a2db
Add space around heading
mernst Mar 3, 2026
f26dca7
Merge ../checker-framework-branch-master into more-square-brackets
mernst Mar 3, 2026
8e127b5
Merge ../checker-framework-fork-mernst-branch-more-square-brackets in…
mernst Mar 3, 2026
29b6694
Merge ../checker-framework-branch-master into 7049-dev
mernst Mar 3, 2026
e3f1c5d
Merge ../checker-framework-branch-master into 7049-dev
mernst Mar 4, 2026
b278f86
Addresses Mike's PR review comments.
iamsanjaymalakar Apr 3, 2026
d6b1e99
Merge branch 'master' into 7049-dev
iamsanjaymalakar Apr 3, 2026
9b70eec
Merge branch 'master' into 7049-dev
iamsanjaymalakar Apr 3, 2026
4d88f93
Merge branch 'master' into 7049-dev
iamsanjaymalakar Apr 4, 2026
3e5fcd2
Merge ../checker-framework-branch-master into 7049-dev
mernst Apr 7, 2026
f9b8a87
Merge ../checker-framework-branch-master into 7049-dev
mernst Apr 9, 2026
db0b98b
Add comment
mernst Apr 9, 2026
4fccac1
Use named `instanceof`
mernst Apr 9, 2026
96dee63
Eliminate need for warning suppression
mernst Apr 9, 2026
f5420f7
Tweaks
mernst Apr 9, 2026
1bc4989
Merge branch '7049-dev' of github.com:iamsanjaymalakar/checker-framew…
mernst Apr 9, 2026
27703ee
Addresses PR comments.
iamsanjaymalakar Apr 11, 2026
f55e800
Merge branch 'master' into 7049-dev
iamsanjaymalakar Apr 12, 2026
a4b23a5
Merge branch '7049-dev' of github.com:iamsanjaymalakar/checker-framew…
mernst Apr 13, 2026
e9fcc45
Merge ../checker-framework-branch-master into 7049-dev
mernst Apr 14, 2026
1f04475
Merge ../checker-framework-branch-master into 7049-dev
mernst Apr 14, 2026
544c7f8
Code review changes
mernst Apr 14, 2026
05247d8
Update contract: return node must have an expression
mernst Apr 14, 2026
013cc24
Merge branch '7049-dev' of github.com:iamsanjaymalakar/checker-framew…
mernst Apr 14, 2026
9764391
Merge branch 'master' into 7049-dev
iamsanjaymalakar Apr 17, 2026
b5cd39c
Add import statement
mernst Apr 19, 2026
38ef995
Addresses PR comments.
iamsanjaymalakar Apr 20, 2026
038ae36
improve documentation.
iamsanjaymalakar Apr 20, 2026
6bdd2e9
Merge branch 'master' into 7049-dev
iamsanjaymalakar Apr 20, 2026
8f1a689
Adds @FindDistinct.
iamsanjaymalakar Apr 20, 2026
3476b4d
Adds @InternedDistinct.
iamsanjaymalakar Apr 20, 2026
6a62d27
Code review changes
mernst Apr 22, 2026
54448fd
Merge ../checker-framework-branch-master into 7049-dev
mernst Apr 22, 2026
e2b0f40
Merge ../checker-framework-fork-iamsanjaymalakar-branch-7049-dev into…
mernst Apr 22, 2026
131101b
Merge pull request #1 from iamsanjaymalakar/7049-dev-2
iamsanjaymalakar Apr 22, 2026
0868839
Merge branch 'master' into 7049-dev
mernst Apr 22, 2026
6b01f8b
Handles nested assignments.
iamsanjaymalakar Apr 22, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,21 @@
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.BlockTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.ExpressionStatementTree;
import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.IdentifierTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.StatementTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePath;
import com.sun.source.util.TreeScanner;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
Expand All @@ -27,16 +36,20 @@
import java.util.Objects;
import java.util.Set;
import java.util.StringJoiner;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import org.checkerframework.checker.calledmethods.qual.CalledMethods;
import org.checkerframework.checker.interning.qual.FindDistinct;
import org.checkerframework.checker.mustcall.CreatesMustCallForToJavaExpression;
import org.checkerframework.checker.mustcall.MustCallAnnotatedTypeFactory;
import org.checkerframework.checker.mustcall.MustCallChecker;
Expand Down Expand Up @@ -1506,6 +1519,21 @@ private void checkReassignmentToField(Set<Obligation> obligations, AssignmentNod
return;
}
}
} else if (TreeUtils.isConstructor(enclosingMethodTree)) {
// Suppress if this is the first write to a private field in the constructor if we can
// conservatively guarantee no earlier field write or method call overwrites the field.
Comment thread
mernst marked this conversation as resolved.
Outdated
Element enclosingClassElement =
TreeUtils.elementFromDeclaration(enclosingMethodTree).getEnclosingElement();
if (ElementUtils.isTypeElement(enclosingClassElement)) {
Comment thread
mernst marked this conversation as resolved.
Outdated
Element receiverElement = TypesUtils.getTypeElement(receiver.getType());
if (Objects.equals(enclosingClassElement, receiverElement)) {
VariableElement lhsElement = lhs.getElement();
if (lhsElement.getModifiers().contains(Modifier.PRIVATE)
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
&& isFirstAndOnlyAssignmentToField(lhsElement, enclosingMethodTree, node.getTree())) {
return;
}
}
}
}

// Check that there is a corresponding CreatesMustCallFor annotation, unless this is
Expand Down Expand Up @@ -1625,6 +1653,135 @@ && varTrackedInObligations(obligations, (LocalVariableNode) receiver))
}
}

/**
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
* Returns true if the given assignment is definitely the first and only write to {@code field}
* during object construction. Conservatively returns {@code false} if ther is any uncertainty
* (e.g., earlier method calls or ambiguous writes).
*
* <p>This helps suppress false positive resource leak warnings.
*
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
* <ul>
* <li>The field is private.
* <li>It has no non-null inline initializer.
* <li>It is not assigned in any instance initializer block.
* <li>The constructor does not use constructor chaining via {@code this(...)}.
* <li>There are no earlier assignments to the same field before this one in the constructor.
* <li>There are no method calls before this assignment that might modify the field.
Comment thread
mernst marked this conversation as resolved.
Outdated
* </ul>
*
* @param field the field being assigned
* @param constructor the constructor in which the assignment appears
* @param currentAssignment the actual assignment tree being analyzed, which is a statement in
* {@code constructor}
* @return true if this assignment is the first and only one during construction
*/
private boolean isFirstAndOnlyAssignmentToField(
VariableElement field, MethodTree constructor, @FindDistinct Tree currentAssignment) {
@Nullable TreePath constructorPath = cmAtf.getPath(constructor);
ClassTree classTree = TreePathUtil.enclosingClass(constructorPath);
String fieldName = field.getSimpleName().toString();

// Disallow non-null inline initializer
for (Tree member : classTree.getMembers()) {
if (member instanceof VariableTree) {
VariableTree var = (VariableTree) member;
if (var.getName().contentEquals(fieldName) && var.getInitializer() != null) {
if (var.getInitializer().getKind() != Tree.Kind.NULL_LITERAL) {
return false;
}
}
}
}

// Disallow assignment in instance initializer blocks
for (Tree member : classTree.getMembers()) {
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
if (member instanceof BlockTree) {
BlockTree block = (BlockTree) member;
if (block.isStatic()) continue;
// The variables accessed from within the inner class need to be effectively final, so
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
// AtomicBoolean is used here.
AtomicBoolean found = new AtomicBoolean(false);
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
block.accept(
new TreeScanner<Void, Void>() {
@Override
public Void visitAssignment(AssignmentTree node, Void unused) {
ExpressionTree lhs = node.getVariable();
Name lhsName =
lhs instanceof MemberSelectTree
? ((MemberSelectTree) lhs).getIdentifier()
: lhs instanceof IdentifierTree ? ((IdentifierTree) lhs).getName() : null;
if (lhsName != null && lhsName.contentEquals(fieldName)) {
found.set(true);
}
return super.visitAssignment(node, unused);
}
},
null);
if (found.get()) {
return false;
}
}
}
// Check constructor initialization chaining
if (callsThisConstructor(constructor)) {
return false;
}
// Check for earlier assignments to the same field, or any method calls other than super
List<? extends StatementTree> statements = constructor.getBody().getStatements();
for (StatementTree stmt : statements) {
if (!(stmt instanceof ExpressionStatementTree)) {
continue;
}
ExpressionTree expr = ((ExpressionStatementTree) stmt).getExpression();
// Stop when we reach the current assignment
if (expr == currentAssignment) {
Comment thread
mernst marked this conversation as resolved.
Outdated
break;
}
// Prior assignment to the same field
if (expr instanceof AssignmentTree) {
ExpressionTree lhs = ((AssignmentTree) expr).getVariable();
Name lhsName = null;
if (lhs instanceof MemberSelectTree) {
lhsName = ((MemberSelectTree) lhs).getIdentifier();
} else if (lhs instanceof IdentifierTree) {
lhsName = ((IdentifierTree) lhs).getName();
}
if (lhsName != null && lhsName.contentEquals(fieldName)) {
return false; // Unsafe: field already assigned earlier
}
}
// Any method call before assignment (except super constructor)
if (expr instanceof MethodInvocationTree
&& !TreeUtils.isSuperConstructorCall((MethodInvocationTree) expr)) {
return false; // Unsafe: method may write to field internally
}
}
return true;
}

/**
* Returns true if the given constructor delegates to another constructor in the same class using
* a {@code this(...)} call as its first statement.
*
* @param constructor a constructor method
* @return {@code true} if the constructor starts with a {@code this(...)} call, {@code false}
* otherwise
*/
private boolean callsThisConstructor(MethodTree constructor) {
Comment thread
iamsanjaymalakar marked this conversation as resolved.
Outdated
List<? extends StatementTree> statements = constructor.getBody().getStatements();
if (statements.isEmpty()) {
return false;
}
StatementTree firstStmt = statements.get(0);
if (firstStmt instanceof ExpressionStatementTree) {
ExpressionTree expr = ((ExpressionStatementTree) firstStmt).getExpression();
if (expr instanceof MethodInvocationTree) {
return TreeUtils.isThisConstructorCall((MethodInvocationTree) expr);
}
}
return false;
}

/**
* Checks that the method that encloses an assignment is marked with @CreatesMustCallFor
* annotation whose target is the object whose field is being re-assigned.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package org.checkerframework.checker.test.junit;

import java.io.File;
import java.util.List;
import org.checkerframework.checker.resourceleak.ResourceLeakChecker;
import org.checkerframework.framework.test.CheckerFrameworkPerDirectoryTest;
import org.junit.runners.Parameterized.Parameters;

/**
* Tests for validating safe suppression of resource leak warnings when a private field is
* initialized for the first time inside a constructor.
*
* <p>These tests check that the checker allows first-time constructor-based assignments (when safe)
* and continues to report reassignments or leaks in all other cases (e.g., after method calls,
* initializer blocks, etc.).
*/
public class ResourceLeakFirstInitConstructorTest extends CheckerFrameworkPerDirectoryTest {
public ResourceLeakFirstInitConstructorTest(List<File> testFiles) {
super(
testFiles,
ResourceLeakChecker.class,
"resourceleak-firstinitconstructor",
"-AwarnUnneededSuppressions",
"-encoding",
"UTF-8");
}

@Parameters
public static String[] getTestDirs() {
return new String[] {"resourceleak-firstinitconstructor"};
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Test: Field is initialized in one constructor and reassigned in another via this() chaining.
// Expected: Warning in constructor and open() due to reassignments.

import java.io.FileInputStream;
import org.checkerframework.checker.calledmethods.qual.*;
import org.checkerframework.checker.mustcall.qual.*;

@InheritableMustCall({"close"})
class ConstructorChainingLeak {
private @Owning FileInputStream s;

public ConstructorChainingLeak() throws Exception {
this(42);
Comment thread
iamsanjaymalakar marked this conversation as resolved.
// :: error: (required.method.not.called)
s = new FileInputStream("test.txt");
}

private ConstructorChainingLeak(int x) throws Exception {
s = new FileInputStream("test.txt");
}

// :: error: (missing.creates.mustcall.for)
public void open() {
try {
// :: error: (required.method.not.called)
s = new FileInputStream("test.txt");
} catch (Exception e) {
}
}

@EnsuresCalledMethods(value = "this.s", methods = "close")
public void close() {
try {
s.close();
} catch (Exception e) {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Test: Field is explicitly initialized to null and assigned in constructor.
// Expected: No warning in constructor, warning in open().

import java.io.FileInputStream;
import org.checkerframework.checker.calledmethods.qual.*;
import org.checkerframework.checker.mustcall.qual.*;

@InheritableMustCall({"close"})
class ExplicitNullInitializer {
private @Owning FileInputStream s = null;

public ExplicitNullInitializer() {
try {
s = new FileInputStream("test.txt");
} catch (Exception e) {
}
}

// :: error: (missing.creates.mustcall.for)
public void open() {
try {
// :: error: (required.method.not.called)
s = new FileInputStream("test.txt");
} catch (Exception e) {
}
}

@EnsuresCalledMethods(value = "this.s", methods = "close")
public void close() {
try {
s.close();
} catch (Exception e) {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Test: Field has no initializer and is first assigned in constructor.
// Expected: No warning in constructor, warning in open().

import java.io.FileInputStream;
import org.checkerframework.checker.calledmethods.qual.*;
import org.checkerframework.checker.mustcall.qual.*;

@InheritableMustCall({"close"})
class FirstAssignmentInConstructor {
private @Owning FileInputStream s;

public FirstAssignmentInConstructor() {
try {
s = new FileInputStream("test.txt"); // no warning
} catch (Exception e) {
}
}

// :: error: (missing.creates.mustcall.for)
public void open() {
try {
// :: error: (required.method.not.called)
s = new FileInputStream("test.txt");
} catch (Exception e) {
}
}

@EnsuresCalledMethods(value = "this.s", methods = "close")
public void close() {
try {
s.close();
} catch (Exception e) {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Test: Field has a non-null inline initializer and is reassigned in constructor and open().
// Expected: Warning in constructor and in open().

import java.io.FileInputStream;
import org.checkerframework.checker.calledmethods.qual.*;
import org.checkerframework.checker.mustcall.qual.*;

@InheritableMustCall({"close"})
class InlineInitializerLeak {
private @Owning FileInputStream s = new FileInputStream("test.txt");

public InlineInitializerLeak() throws Exception {
// :: error: (required.method.not.called)
s = new FileInputStream("test.txt");
}

// :: error: (missing.creates.mustcall.for)
public void open() {
try {
// :: error: (required.method.not.called)
s = new FileInputStream("test.txt");
} catch (Exception e) {
}
}

@EnsuresCalledMethods(value = "this.s", methods = "close")
public void close() {
try {
s.close();
} catch (Exception e) {
}
}
}
Loading