First Phase of RLC inference

checker/src/main/java/org/checkerframework/checker/calledmethods/CalledMethodsTransfer.java

@@ -1,5 +1,6 @@
 package org.checkerframework.checker.calledmethods;
 
+import com.sun.source.tree.Tree;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -61,6 +62,16 @@ public CalledMethodsTransfer(final CalledMethodsAnalysis analysis) {
         ((CalledMethodsAnnotatedTypeFactory) atypeFactory).calledMethodsValueElement;
   }
 
+  @Override
+  protected boolean shouldPerformWholeProgramInference(Tree tree) {
+    return false;
+  }
+
+  @Override
+  protected boolean shouldPerformWholeProgramInference(Tree expressionTree, Tree lhsTree) {
+    return false;
+  }
+
   @Override
   public TransferResult<CFValue, CFStore> visitMethodInvocation(
       final MethodInvocationNode node, final TransferInput<CFValue, CFStore> input) {

checker/src/main/java/org/checkerframework/checker/mustcall/MustCallAnnotatedTypeFactory.java

@@ -218,6 +218,9 @@ protected void constructorFromUsePreSubstitution(
    */
   private void changeNonOwningParameterTypesToTop(
       ExecutableElement declaration, AnnotatedExecutableType type) {
+    if (getWholeProgramInference() != null) {
+      return;
+    }
     List<AnnotatedTypeMirror> parameterTypes = type.getParameterTypes();
     for (int i = 0; i < parameterTypes.size(); i++) {
       Element paramDecl = declaration.getParameters().get(i);
@@ -411,7 +414,13 @@ public MustCallTreeAnnotator(MustCallAnnotatedTypeFactory mustCallAnnotatedTypeF
     @Override
     public Void visitIdentifier(IdentifierTree tree, AnnotatedTypeMirror type) {
       Element elt = TreeUtils.elementFromUse(tree);
-      if (elt.getKind() == ElementKind.PARAMETER
+      if (getWholeProgramInference() != null
+          && elt.getKind() == ElementKind.PARAMETER
+          && getDeclAnnotation(elt, MustCallAlias.class) != null) {
+        type.replaceAnnotation(BOTTOM);
+      }
+      if (getWholeProgramInference() == null
+          && elt.getKind() == ElementKind.PARAMETER
           && (noLightweightOwnership || getDeclAnnotation(elt, Owning.class) == null)) {
         type.replaceAnnotation(BOTTOM);
       }

checker/src/main/java/org/checkerframework/checker/mustcall/MustCallTransfer.java

@@ -3,6 +3,7 @@
 import com.sun.source.tree.ClassTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.IdentifierTree;
+import com.sun.source.tree.Tree;
 import com.sun.source.tree.VariableTree;
 import com.sun.source.util.TreePath;
 import java.util.List;
@@ -174,6 +175,16 @@ private void lubWithStoreValue(CFStore store, JavaExpression expr, AnnotationMir
     store.insertValue(expr, newValue);
   }
 
+  @Override
+  protected boolean shouldPerformWholeProgramInference(Tree tree) {
+    return false;
+  }
+
+  @Override
+  protected boolean shouldPerformWholeProgramInference(Tree expressionTree, Tree lhsTree) {
+    return false;
+  }
+
   @Override
   public TransferResult<CFValue, CFStore> visitObjectCreation(
       ObjectCreationNode node, TransferInput<CFValue, CFStore> input) {

checker/src/main/java/org/checkerframework/checker/mustcall/MustCallVisitor.java

@@ -21,6 +21,7 @@
 import org.checkerframework.checker.mustcall.qual.MustCall;
 import org.checkerframework.checker.mustcall.qual.MustCallAlias;
 import org.checkerframework.checker.mustcall.qual.NotOwning;
+import org.checkerframework.checker.mustcall.qual.PolyMustCall;
 import org.checkerframework.common.basetype.BaseTypeChecker;
 import org.checkerframework.common.basetype.BaseTypeVisitor;
 import org.checkerframework.framework.type.AnnotatedTypeMirror;
@@ -189,9 +190,22 @@ public boolean isValidUse(
     // Note that isValidUse does not need to consider component types, on which it should be
     // called separately.
     Element elt = TreeUtils.elementFromTree(tree);
-    if (elt != null
-        && AnnotationUtils.containsSameByClass(elt.getAnnotationMirrors(), MustCallAlias.class)) {
-      return true;
+    if (elt != null) {
+      // Need to check the type mirror for ajava-derived annotations and the element itself
+      // for human-written annotations from the source code. Getting to the ajava file directly
+      // at this point is impossible, so we approximate "the ajava file has an @MustCallAlias
+      // annotation" with "there is an @PolyMustCall annotation on the use type, but not in the
+      // source code". This only works because none of our inference techniques infer @PolyMustCall,
+      // so if @PolyMustCall is present but wasn't in the source, it must have been derived from
+      // an @MustCallAlias annotation (which we do infer).
+      boolean ajavaFileHasMustCallAlias =
+          useType.hasAnnotation(PolyMustCall.class)
+              && !AnnotationUtils.containsSameByClass(
+                  elt.getAnnotationMirrors(), PolyMustCall.class);
+      if (ajavaFileHasMustCallAlias
+          || AnnotationUtils.containsSameByClass(elt.getAnnotationMirrors(), MustCallAlias.class)) {
+        return true;
+      }
     }
     return super.isValidUse(declarationType, useType, tree);
   }

checker/src/main/java/org/checkerframework/checker/resourceleak/MustCallConsistencyAnalyzer.java

@@ -1021,7 +1021,7 @@ private void updateObligationsForOwningReturn(
    * @param node a node
    * @return the temporary for node, or node if no temporary exists
    */
-  private Node getTempVarOrNode(final Node node) {
+  protected Node getTempVarOrNode(final Node node) {
     Node temp = typeFactory.getTempVarForNode(node);
     if (temp != null) {
       return temp;
@@ -1150,7 +1150,7 @@ private boolean hasAtMostOneOwningField(TypeElement element) {
    * @param node the node
    * @return true if must-call type of node only contains close
    */
-  private boolean isMustCallClose(Node node) {
+  protected boolean isMustCallClose(Node node) {
     MustCallAnnotatedTypeFactory mcAtf =
         typeFactory.getTypeFactoryOfSubchecker(MustCallChecker.class);
     AnnotatedTypeMirror mustCallAnnotatedType = mcAtf.getAnnotatedType(node.getTree());
@@ -1164,7 +1164,8 @@ private boolean isMustCallClose(Node node) {
    * @param obligations the set of Obligations
    * @param var a variable
    */
-  private void removeObligationsContainingVar(Set<Obligation> obligations, LocalVariableNode var) {
+  protected void removeObligationsContainingVar(
+      Set<Obligation> obligations, LocalVariableNode var) {
     Obligation obligationForVar = getObligationForVar(obligations, var);
     while (obligationForVar != null) {
       obligations.remove(obligationForVar);
@@ -1585,7 +1586,7 @@ private Node removeCastsAndGetTmpVarIfPresent(Node node) {
    * @param node a MethodInvocation or ObjectCreation node
    * @return the arguments, in order
    */
-  private List<Node> getArgumentsOfInvocation(Node node) {
+  protected List<Node> getArgumentsOfInvocation(Node node) {
     if (node instanceof MethodInvocationNode) {
       MethodInvocationNode invocationNode = (MethodInvocationNode) node;
       return invocationNode.getArguments();
@@ -1604,7 +1605,7 @@ private List<Node> getArgumentsOfInvocation(Node node) {
    * @return a list of the declarations of the formal parameters of the method or constructor being
    *     invoked
    */
-  private List<? extends VariableElement> getParametersOfInvocation(Node node) {
+  protected List<? extends VariableElement> getParametersOfInvocation(Node node) {
     ExecutableElement executableElement;
     if (node instanceof MethodInvocationNode) {
       MethodInvocationNode invocationNode = (MethodInvocationNode) node;
@@ -1987,7 +1988,7 @@ private static boolean varTrackedInObligations(
    * @return the Obligation in {@code obligations} whose resource alias set contains {@code node},
    *     or {@code null} if there is no such Obligation
    */
-  private static @Nullable Obligation getObligationForVar(
+  protected static @Nullable Obligation getObligationForVar(
       Set<Obligation> obligations, LocalVariableNode node) {
     for (Obligation obligation : obligations) {
       if (obligation.canBeSatisfiedThrough(node)) {
@@ -2225,7 +2226,7 @@ private static void propagate(
    * consists of BlockWithObligations objects, each representing the need to handle the set of
    * dataflow facts reaching the block during analysis.
    */
-  private static class BlockWithObligations {
+  static class BlockWithObligations {
 
     /** The block. */
     public final Block block;