pull-pico-changes: expose and add method

checker/src/main/java/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java

@@ -394,7 +394,7 @@ public void postAsMemberOf(
      * @see #computeFieldAccessType
      * @see #getAnnotatedTypeLhs(Tree)
      */
-    private boolean computingAnnotatedTypeMirrorOfLHS = false;
+    protected boolean computingAnnotatedTypeMirrorOfLHS = false;
 
     @Override
     public AnnotatedTypeMirror getAnnotatedTypeLhs(Tree lhsTree) {

checker/src/main/java/org/checkerframework/checker/nullness/KeyForAnnotatedTypeFactory.java

@@ -121,7 +121,7 @@ public KeyForTypeHierarchy(
         }
 
         @Override
-        protected boolean isSubtype(
+        public boolean isSubtype(
                 AnnotatedTypeMirror subtype, AnnotatedTypeMirror supertype, AnnotationMirror top) {
             // TODO: THIS IS FROM THE OLD TYPE HIERARCHY.  WE SHOULD FIX DATA-FLOW/PROPAGATION TO DO
             // THE RIGHT THING

framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java

@@ -380,7 +380,15 @@ public S initialStore(
         return info;
     }
 
-    private void addFieldValues(
+    /**
+     * Add knowledge about field values to the store {@code info}.
+     *
+     * @param info {@code S}
+     * @param factory the type factory
+     * @param classTree the class tree
+     * @param methodTree the method tree
+     */
+    protected void addFieldValues(
             S info, AnnotatedTypeFactory factory, ClassTree classTree, MethodTree methodTree) {
 
         // Add knowledge about final fields, or values of non-final fields

framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java

@@ -796,6 +796,15 @@ protected ViewpointAdapter createViewpointAdapter() {
         return null;
     }
 
+    /**
+     * Get {@link #viewpointAdapter}.
+     *
+     * @return {@link #viewpointAdapter}
+     */
+    public ViewpointAdapter getViewpointAdapter() {
+        return viewpointAdapter;
+    }
+
     /**
      * TypeVariableSubstitutor provides a method to replace type parameters with their arguments.
      */
@@ -1363,7 +1372,7 @@ private AnnotatedTypeMirror fromExpression(ExpressionTree tree) {
      * @param tree the type tree
      * @return the (partially) annotated type of the type in the AST
      */
-    /*package private*/ final AnnotatedTypeMirror fromTypeTree(Tree tree) {
+    public final AnnotatedTypeMirror fromTypeTree(Tree tree) {
         if (shouldCache && fromTypeTreeCache.containsKey(tree)) {
             return fromTypeTreeCache.get(tree).deepCopy();
         }

framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java

@@ -173,7 +173,8 @@ public boolean isSubtype(
      * @return returns true if {@code subtype} is a subtype of {@code supertype} in the qualifier
      *     hierarchy whose top is {@code top}
      */
-    protected boolean isSubtype(
+    @Override
+    public boolean isSubtype(
             final AnnotatedTypeMirror subtype,
             final AnnotatedTypeMirror supertype,
             final AnnotationMirror top) {

framework/src/main/java/org/checkerframework/framework/type/TypeHierarchy.java

@@ -1,5 +1,6 @@
 package org.checkerframework.framework.type;
 
+import javax.lang.model.element.AnnotationMirror;
 import org.checkerframework.framework.util.AnnotatedTypes;
 
 /** Compares AnnotatedTypeMirrors for subtype relationships. See also QualifierHierarchy */
@@ -59,4 +60,18 @@ public interface TypeHierarchy {
      *     present.
      */
     boolean isSubtype(AnnotatedTypeMirror subtype, AnnotatedTypeMirror supertype);
+
+    /**
+     * The same as {@link #isSubtype(AnnotatedTypeMirror, AnnotatedTypeMirror)}, but only for the
+     * hierarchy of which {@code top} is the top.
+     *
+     * @param subtype possible subtype
+     * @param supertype possible supertype
+     * @param top the qualifier at the top of the hierarchy for which the subtype check should be
+     *     preformed
+     * @return true if {@code subtype} is a subtype of {@code supertype} in the qualifier hierarchy
+     *     whose top is {@code top}
+     */
+    boolean isSubtype(
+            AnnotatedTypeMirror subtype, AnnotatedTypeMirror supertype, AnnotationMirror top);
 }