Make some methods and fields public for inference

opprop · Feb 27, 2024 · fd3b869 · fd3b869
1 parent 22a3aa2
commit fd3b869
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java
@@ -3012,7 +3012,7 @@ protected List<AnnotatedTypeMirror> getExplicitNewClassClassTypeArgs(NewClassTre
      * @param newClassTree a diamond new class tree
      * @return the class type arguments for {@code newClassTree}
      */
-    private List<AnnotatedTypeMirror> inferDiamondType(NewClassTree newClassTree) {
+    public List<AnnotatedTypeMirror> inferDiamondType(NewClassTree newClassTree) {
         assert TreeUtils.isDiamondTree(newClassTree) : "Expected diamond new class tree";
         AnnotatedDeclaredType diamondType =
                 (AnnotatedDeclaredType) toAnnotatedType(TreeUtils.typeOf(newClassTree), false);

diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeMirror.java
@@ -70,7 +70,7 @@ public abstract class AnnotatedTypeMirror implements DeepCopyable<AnnotatedTypeM
     protected final AnnotatedTypeFactory atypeFactory;
 
     /** The actual type wrapped by this AnnotatedTypeMirror. */
-    protected final TypeMirror underlyingType;
+    public final TypeMirror underlyingType;
 
     /**
      * Saves the result of {@code underlyingType.toString().hashCode()} to use when computing the
@@ -1260,8 +1260,7 @@ public void computeVarargType() {
          *
          * @param annotatedExecutableType an AnnotatedExecutableType
          */
-        /*package-private*/ void computeVarargType(
-                AnnotatedExecutableType annotatedExecutableType) {
+        public void computeVarargType(AnnotatedExecutableType annotatedExecutableType) {
             computeVarargType(annotatedExecutableType.getParameterTypes());
         }
 
@@ -1347,7 +1346,7 @@ public AnnotatedTypeMirror getReturnType() {
          *
          * @param receiverType the receiver type
          */
-        /*package-private*/ void setReceiverType(AnnotatedDeclaredType receiverType) {
+        public void setReceiverType(AnnotatedDeclaredType receiverType) {
             this.receiverType = receiverType;
             receiverTypeComputed = true;
         }