Add RLC-only SideEffectFree stubs and tests

checker/src/main/java/org/checkerframework/checker/rlccalledmethods/RLCCalledMethodsChecker.java

@@ -19,7 +19,7 @@
  * CalledMethodsChecker} used as a subchecker in the ResourceLeakChecker, and never independently.
  * Runs the MustCallChecker as a subchecker in order to share the CFG.
  */
-@StubFiles("IOUtils.astub")
+@StubFiles({"IOUtils.astub", "log4j.astub"})
 public class RLCCalledMethodsChecker extends CalledMethodsChecker {
 
   /** Creates a RLCCalledMethodsChecker. */

checker/src/main/java/org/checkerframework/checker/rlccalledmethods/jdk.astub

@@ -0,0 +1,33 @@
+package java.lang;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import org.checkerframework.checker.lock.qual.GuardSatisfied;
+import org.checkerframework.dataflow.qual.SideEffectFree;
+
+public interface AutoCloseable {
+  @SideEffectFree
+  void close(@GuardSatisfied AutoCloseable this) throws Exception;
+}
+
+public class Throwable {
+  @SideEffectFree
+  public void printStackTrace();
+
+  @SideEffectFree
+  public void printStackTrace(PrintStream s);
+
+  @SideEffectFree
+  public void printStackTrace(PrintWriter s);
+}
+
+package java.io;
+
+import java.io.IOException;
+import org.checkerframework.checker.lock.qual.GuardSatisfied;
+import org.checkerframework.dataflow.qual.SideEffectFree;
+
+public interface Closeable extends AutoCloseable {
+  @SideEffectFree
+  public void close(@GuardSatisfied Closeable this) throws IOException;
+}

checker/src/main/java/org/checkerframework/checker/rlccalledmethods/log4j.astub

@@ -0,0 +1,14 @@
+package org.apache.log4j;
+
+import org.checkerframework.dataflow.qual.SideEffectFree;
+
+class Category {
+  @SideEffectFree
+  public void debug(Object message);
+
+  @SideEffectFree
+  public void warn(Object message);
+
+  @SideEffectFree
+  public void error(Object message);
+}

checker/tests/resourceleak/TwoResourcesECM.java

@@ -12,19 +12,12 @@
 class TwoResourcesECM {
   @Owning Socket s1, s2;
 
-  // The contracts.postcondition error below is thrown because s1 is not final,
-  // and therefore might theoretically be side-effected by the call to s2.close()
-  // even on the non-exceptional path. See ReplicaInputStreams.java for a variant
-  // of this test where such an error is not issued. Because this method can leak
-  // along both regular and exceptional exits, both errors are issued.
-  //
   // The contracts.exceptional.postcondition error is thrown because destructors
   // have to close their resources even on exception.  If s1.close() throws an
   // exception, then s2.close() will not be called.
   @EnsuresCalledMethods(
       value = {"this.s1", "this.s2"},
       methods = {"close"})
-  // :: error: [contracts.postcondition]
   // :: error: [contracts.exceptional.postcondition]
   public void dispose() throws IOException {
     s1.close();

checker/tests/resourceleak/sideeffect-free-stubs/AutoCloseableClose.java

@@ -0,0 +1,30 @@
+// RLC uses Called Methods facts to remember that a resource has already been closed.
+// This test checks that the RLC-specific SideEffectFree stub for AutoCloseable.close()
+// preserves those facts across another close call in the same destructor, rather than
+// conservatively forgetting them after the first invocation.
+
+import org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethods;
+import org.checkerframework.checker.mustcall.qual.Owning;
+
+final class TestAutoCloseable implements AutoCloseable {
+  @Override
+  public void close() {}
+}
+
+class AutoCloseableClose implements AutoCloseable {
+  private @Owning AutoCloseable first = new TestAutoCloseable();
+  private @Owning AutoCloseable second = new TestAutoCloseable();
+
+  @Override
+  @EnsuresCalledMethods(
+      value = {"this.first", "this.second"},
+      methods = "close")
+  public void close() {
+    try {
+      first.close();
+      second.close();
+    } catch (Exception e) {
+      throw new AssertionError(e);
+    }
+  }
+}

checker/tests/resourceleak/sideeffect-free-stubs/CloseableClose.java

@@ -0,0 +1,35 @@
+// RLC uses Called Methods facts to remember that a resource has already been closed.
+// This test checks that the RLC-specific SideEffectFree stub for Closeable.close()
+// preserves those facts across another close call in the same destructor, rather than
+// conservatively forgetting them after the first invocation.
+
+import java.io.Closeable;
+import java.io.IOException;
+import org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethods;
+import org.checkerframework.checker.mustcall.qual.Owning;
+
+final class TestCloseable implements Closeable {
+  @Override
+  public void close() {}
+}
+
+class CloseableClose implements Closeable {
+  private @Owning Closeable first = new TestCloseable();
+  private @Owning Closeable second = new TestCloseable();
+
+  @Override
+  @EnsuresCalledMethods(
+      value = {"this.first", "this.second"},
+      methods = "close")
+  // The exceptional postcondition is still expected to fail: if first.close() throws,
+  // then second.close() is not reached.
+  // :: error: contracts.exceptional.postcondition
+  public void close() {
+    try {
+      first.close();
+      second.close();
+    } catch (IOException e) {
+      throw new AssertionError(e);
+    }
+  }
+}

checker/tests/resourceleak/sideeffect-free-stubs/Log4jObjectCalls.java

@@ -0,0 +1,58 @@
+// RLC-specific stubs mark these Log4j logging methods as SideEffectFree so that
+// diagnostic logging after a resource is closed does not wipe out the close fact.
+// This file checks the Object-taking debug/warn/error overloads that were added.
+
+package org.apache.log4j;
+
+import java.io.Closeable;
+import org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethods;
+import org.checkerframework.checker.mustcall.qual.Owning;
+
+class Category {
+  public void debug(Object message) {}
+
+  public void error(Object message) {}
+
+  public void warn(Object message) {}
+}
+
+final class CloseableResource implements Closeable {
+  @Override
+  public void close() {}
+}
+
+class Log4jDebugObject implements Closeable {
+  private final Category logger = new Category();
+  private @Owning CloseableResource resource = new CloseableResource();
+
+  @Override
+  @EnsuresCalledMethods(value = "this.resource", methods = "close")
+  public void close() {
+    resource.close();
+    logger.debug("after close");
+  }
+}
+
+class Log4jWarnObject implements Closeable {
+  private final Category logger = new Category();
+  private @Owning CloseableResource resource = new CloseableResource();
+
+  @Override
+  @EnsuresCalledMethods(value = "this.resource", methods = "close")
+  public void close() {
+    resource.close();
+    logger.warn("after close");
+  }
+}
+
+class Log4jErrorObject implements Closeable {
+  private final Category logger = new Category();
+  private @Owning CloseableResource resource = new CloseableResource();
+
+  @Override
+  @EnsuresCalledMethods(value = "this.resource", methods = "close")
+  public void close() {
+    resource.close();
+    logger.error("after close");
+  }
+}

checker/tests/resourceleak/sideeffect-free-stubs/ThrowablePrintStackTrace.java

@@ -0,0 +1,52 @@
+// RLC-specific stubs mark Throwable.printStackTrace overloads as SideEffectFree so
+// that debugging/logging after a resource is closed does not wipe out the close fact.
+// This file checks the no-arg, PrintStream, and PrintWriter variants.
+
+import java.io.Closeable;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import org.checkerframework.checker.calledmethods.qual.EnsuresCalledMethods;
+import org.checkerframework.checker.mustcall.qual.Owning;
+
+final class CloseableResource implements Closeable {
+  @Override
+  public void close() {}
+}
+
+class ThrowablePrintStackTrace implements Closeable {
+  private @Owning CloseableResource resource = new CloseableResource();
+
+  @Override
+  @EnsuresCalledMethods(value = "this.resource", methods = "close")
+  public void close() {
+    resource.close();
+    new RuntimeException("debug").printStackTrace();
+  }
+}
+
+class ThrowablePrintStackTracePrintStream implements Closeable {
+  private static final PrintStream STREAM = System.err;
+
+  private @Owning CloseableResource resource = new CloseableResource();
+
+  @Override
+  @EnsuresCalledMethods(value = "this.resource", methods = "close")
+  public void close() {
+    resource.close();
+    new RuntimeException("debug").printStackTrace(STREAM);
+  }
+}
+
+class ThrowablePrintStackTracePrintWriter implements Closeable {
+  private static final PrintWriter WRITER = new PrintWriter(new StringWriter());
+
+  private @Owning CloseableResource resource = new CloseableResource();
+
+  @Override
+  @EnsuresCalledMethods(value = "this.resource", methods = "close")
+  public void close() {
+    resource.close();
+    new RuntimeException("debug").printStackTrace(WRITER);
+  }
+}