From c107810b03e237e8c513153c85ec87179f0923a9 Mon Sep 17 00:00:00 2001
From: Stephan Herrmann <stephan.herrmann@berlin.de>
Date: Sat, 17 Aug 2024 21:19:58 +0200
Subject: [PATCH] False Positive Potential Resource Leak Warnings - @NotOwning
 Not Working Correctly

+ respect an explicit @NotOwning during field analysis
+ update testSharedField() to show that @NotOwning field is "safe"

fixes https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2635
---
 .../compiler/ast/FieldDeclaration.java        |  6 +-
 .../ResourceLeakAnnotatedTests.java           | 78 +++++++++++++++++--
 2 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java
index d69c87c5ff1..db24805a2eb 100644
--- a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java
+++ b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/FieldDeclaration.java
@@ -111,11 +111,13 @@ public FlowInfo analyseCode(MethodScope initializationScope, FlowContext flowCon
 			&& this.binding != null
 			&& FakedTrackingVariable.isCloseableNotWhiteListed(this.binding.type))
 	{
+		long owningTagBits = this.binding.tagBits & TagBits.AnnotationOwningMASK;
 		if (this.binding.isStatic()) {
 			initializationScope.problemReporter().staticResourceField(this);
-		} else if ((this.binding.tagBits & TagBits.AnnotationOwning) == 0) {
+		} else if (owningTagBits == 0) {
 			initializationScope.problemReporter().shouldMarkFieldAsOwning(this);
-		} else if (!this.binding.declaringClass.hasTypeBit(TypeIds.BitAutoCloseable|TypeIds.BitCloseable)) {
+		} else if (owningTagBits == TagBits.AnnotationOwning
+				&& !this.binding.declaringClass.hasTypeBit(TypeIds.BitAutoCloseable|TypeIds.BitCloseable)) {
 			initializationScope.problemReporter().shouldImplementAutoCloseable(this);
 		}
 	}
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakAnnotatedTests.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakAnnotatedTests.java
index 27501560bbc..e5e1197bc59 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakAnnotatedTests.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakAnnotatedTests.java
@@ -629,7 +629,7 @@ public class A {
 				PrintWriter fOther;
 				@Owning PrintWriter fProper;
 				boolean useField = false;
-				A(PrintWriter writer1, PrintWriter writer2, @Owning PrintWriter writer3) {
+				A(@Owning PrintWriter writer1, PrintWriter writer2, @Owning PrintWriter writer3) {
 					fWriter = writer1;
 					fOther = writer2;
 					fProper = writer3;
@@ -639,21 +639,21 @@ public class A {
 		},
 		"""
 		----------
-		1. WARNING in A.java (at line 5)
-			@NotOwning PrintWriter fWriter;
-			                       ^^^^^^^
-		It is recommended to mark resource fields as '@Owning' to ensure proper closing
-		----------
-		2. WARNING in A.java (at line 6)
+		1. WARNING in A.java (at line 6)
 			PrintWriter fOther;
 			            ^^^^^^
 		It is recommended to mark resource fields as '@Owning' to ensure proper closing
 		----------
-		3. WARNING in A.java (at line 7)
+		2. WARNING in A.java (at line 7)
 			@Owning PrintWriter fProper;
 			                    ^^^^^^^
 		Class with resource fields tagged as '@Owning' should implement AutoCloseable
 		----------
+		3. ERROR in A.java (at line 9)
+			A(@Owning PrintWriter writer1, PrintWriter writer2, @Owning PrintWriter writer3) {
+			                      ^^^^^^^
+		Resource leak: 'writer1' is never closed
+		----------
 		""",
 		options
 		);
@@ -1703,4 +1703,66 @@ public class ClassWithStatics {
 		""",
 		options);
 }
+public void testGH2635() {
+	Map<String, String> options = getCompilerOptions();
+	options.put(CompilerOptions.OPTION_ReportPotentiallyUnclosedCloseable, CompilerOptions.ERROR);
+	options.put(CompilerOptions.OPTION_ReportUnclosedCloseable, CompilerOptions.ERROR);
+	options.put(CompilerOptions.OPTION_ReportExplicitlyClosedAutoCloseable, CompilerOptions.ERROR);
+	runLeakTestWithAnnotations(
+		new String[] {
+			"owning_test/OwningTest.java",
+			"""
+			package owning_test;
+
+			import java.io.FileInputStream;
+			import java.io.FileNotFoundException;
+			import java.io.IOException;
+			import java.io.InputStream;
+
+			import org.eclipse.jdt.annotation.Owning;
+
+			public class OwningTest implements AutoCloseable {
+
+				@Owning
+				private InputStream fileInputStream;
+
+				@SuppressWarnings("unused")
+				private NotOwningTest cacheUser;
+
+				public void initialise() throws FileNotFoundException {
+				  fileInputStream = new FileInputStream("test.txt");
+				  cacheUser = new NotOwningTest(fileInputStream);
+				}
+
+				@Override
+				public void close() throws IOException {
+					fileInputStream.close();
+				}
+
+			}
+			""",
+			"owning_test/NotOwningTest.java",
+			"""
+			package owning_test;
+
+			import java.io.InputStream;
+
+			import org.eclipse.jdt.annotation.NotOwning;
+
+			public class NotOwningTest {
+
+				// If get a warning here - "It is recommended to mark resource fields as '@Owning' to ensure proper closing"
+				@NotOwning
+				private InputStream cacheInputStream;
+
+				NotOwningTest(InputStream aCacheInputStream) {
+					cacheInputStream = aCacheInputStream;
+				}
+
+			}
+			"""
+		},
+		"",
+		options);
+}
 }