From 6147c82e1ef28ea985b3c3ddf6df253e8a2b856e Mon Sep 17 00:00:00 2001 From: Martin Kellogg Date: Thu, 27 Jun 2024 10:48:15 -0400 Subject: [PATCH] Remove references to the defunct Object Construction Checker --- .../checkerframework/checker/mustcall/qual/MustCall.java | 6 +++--- .../checker/mustcall/qual/MustCallUnknown.java | 6 +++--- .../CreatesMustCallForSimpler.java | 2 +- checker/tests/resourceleak/CreatesMustCallForSimple.java | 2 +- checker/tests/resourceleak/CreatesMustCallForSimpler.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCall.java b/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCall.java index 803d1bed320..2aabea501f1 100644 --- a/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCall.java +++ b/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCall.java @@ -13,9 +13,9 @@ * An expression of type {@code @MustCall({"m1", "m2"})} may be obligated to call {@code m1()} * and/or {@code m2()} before it is deallocated, but it is not obligated to call any other methods. * - *

This annotation is enforced by the Object Construction Checker's {@code -AcheckMustCall} mode. - * It enforces that the methods {@code m1()} and {@code m2()} are called on the annotated expression - * before it is deallocated. + *

This annotation can be enforced by running the Resource Leak Checker. It enforces that the + * methods {@code m1()} and {@code m2()} are called on the annotated expression before it is + * deallocated. * *

The subtyping relationship is: * diff --git a/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCallUnknown.java b/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCallUnknown.java index 727a839403b..398051fcdd7 100644 --- a/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCallUnknown.java +++ b/checker-qual/src/main/java/org/checkerframework/checker/mustcall/qual/MustCallUnknown.java @@ -11,9 +11,9 @@ * obligation to call any set (even an infinite set!) of methods. This type contains every object. * This type should rarely be written by a programmer. * - *

The Object Construction Checker cannot verify that the property represented by this annotation - * is enforced; that is, the Object Construction Checker will always issue a warning when the value - * of an expression with this type might be de-allocated. + *

The Resource Leak Checker cannot verify that the property represented by this annotation is + * enforced; that is, the Resource Leak Checker will always issue a warning when the value of an + * expression with this type might be de-allocated. * * @checker_framework.manual #must-call-checker Must Call Checker */ diff --git a/checker/tests/resourceleak-nocreatesmustcallfor/CreatesMustCallForSimpler.java b/checker/tests/resourceleak-nocreatesmustcallfor/CreatesMustCallForSimpler.java index ec8339b02d5..da43a22e75d 100644 --- a/checker/tests/resourceleak-nocreatesmustcallfor/CreatesMustCallForSimpler.java +++ b/checker/tests/resourceleak-nocreatesmustcallfor/CreatesMustCallForSimpler.java @@ -1,4 +1,4 @@ -// A simpler test that @CreatesMustCallFor works as intended wrt the Object Construction Checker. +// A simpler test that @CreatesMustCallFor works as intended wrt the Resource Leak Checker. // This test has been modified to expect that CreatesMustCallFor is feature-flagged to off. diff --git a/checker/tests/resourceleak/CreatesMustCallForSimple.java b/checker/tests/resourceleak/CreatesMustCallForSimple.java index 6886c1156a6..83a0f01d509 100644 --- a/checker/tests/resourceleak/CreatesMustCallForSimple.java +++ b/checker/tests/resourceleak/CreatesMustCallForSimple.java @@ -1,4 +1,4 @@ -// A simple test that @CreatesMustCallFor works as intended wrt the Object Construction Checker. +// A simple test that @CreatesMustCallFor works as intended wrt the Resource Leak Checker. import org.checkerframework.checker.calledmethods.qual.*; import org.checkerframework.checker.mustcall.qual.*; diff --git a/checker/tests/resourceleak/CreatesMustCallForSimpler.java b/checker/tests/resourceleak/CreatesMustCallForSimpler.java index bb0b2272188..efbdbeffa8b 100644 --- a/checker/tests/resourceleak/CreatesMustCallForSimpler.java +++ b/checker/tests/resourceleak/CreatesMustCallForSimpler.java @@ -1,4 +1,4 @@ -// A simpler test that @CreatesMustCallFor works as intended wrt the Object Construction Checker. +// A simpler test that @CreatesMustCallFor works as intended wrt the Resource Leak Checker. import org.checkerframework.checker.calledmethods.qual.*; import org.checkerframework.checker.mustcall.qual.*;