diff --git a/checker/src/main/java/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java index 891b4d9c0915..519438e3a347 100644 --- a/checker/src/main/java/org/checkerframework/checker/initialization/InitializationAnnotatedTypeFactory.java +++ b/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) { diff --git a/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java b/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java index a0ccb798b210..07b5b835bb41 100644 --- a/framework/src/main/java/org/checkerframework/framework/flow/CFAbstractTransfer.java +++ b/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 diff --git a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java index fd0d2430d5ac..e2bf127fee54 100644 --- a/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java +++ b/framework/src/main/java/org/checkerframework/framework/type/AnnotatedTypeFactory.java @@ -1363,7 +1363,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(); }