Update with new CF API

opprop · Apr 24, 2024 · 5dc55b7 · 5dc55b7
1 parent b069f96
commit 5dc55b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/pico/inference/PICOInferenceAnnotatedTypeFactory.java b/src/main/java/pico/inference/PICOInferenceAnnotatedTypeFactory.java
@@ -140,7 +140,7 @@ public AnnotatedDeclaredType getSelfType(Tree tree) {
         if (enclosingClass == null) {
             // I hope this only happens when tree is a fake tree that
             // we created, e.g. when desugaring enhanced-for-loops.
-            enclosingClass = getCurrentClassTree(tree);
+            enclosingClass = TreePathUtil.enclosingClass(getPath(tree));
         }
         // "type" is right now VarAnnot inserted to the bound of "enclosingClass"
         AnnotatedDeclaredType type = getAnnotatedType(enclosingClass);

diff --git a/src/main/java/pico/inference/PICOVariableAnnotator.java b/src/main/java/pico/inference/PICOVariableAnnotator.java
@@ -218,7 +218,7 @@ public void storeElementType(Element element, AnnotatedTypeMirror atm) {
     // Copied from super implementation
     @Override
     protected boolean handleWasRawDeclaredTypes(AnnotatedDeclaredType adt) {
-        if (adt.wasRaw() && adt.getTypeArguments().size() != 0) {
+        if (adt.isUnderlyingTypeRaw() && adt.getTypeArguments().size() != 0) {
             // the type arguments should be wildcards AND if I get the real type of "tree"
             // it corresponds to the declaration of adt.getUnderlyingType
             Element declarationEle = adt.getUnderlyingType().asElement();