add subtype constraint in Inference type Hierarchy

Author: txiang61

default.jaif

@@ -0,0 +1,21 @@
+package interning.qual:
+  annotation @UnknownInterned:
+
+package interning.qual:
+  annotation @PolyInterned:
+
+package interning.qual:
+  annotation @Interned:
+
+package :
+class MapAssignment:
+field a:
+insert-annotation Variable.type, ParameterizedType.type: @interning.qual.UnknownInterned
+
+field b:
+insert-annotation Variable.type, ParameterizedType.type: @interning.qual.UnknownInterned
+insert-annotation Variable.type, ParameterizedType.typeArgument 1: @interning.qual.Interned
+
+method <init>()V:
+
+

src/checkers/inference/InferenceTypeHierarchy.java

@@ -7,12 +7,11 @@
 import org.checkerframework.framework.type.StructuralEqualityComparer;
 import org.checkerframework.framework.type.StructuralEqualityVisitHistory;
 import org.checkerframework.framework.type.SubtypeVisitHistory;
+import org.checkerframework.javacutil.AnnotationUtils;
 import org.checkerframework.javacutil.BugInCF;
 
 import javax.lang.model.element.AnnotationMirror;
 
-import checkers.inference.model.Slot;
-
 /**
  *  The InferenceTypeHierarchy along with the InferenceQualifierHierarchy is responsible for
  *  creating a subtype and equality constraints. Normally the methods of these two classes are queried
@@ -27,7 +26,6 @@ public class InferenceTypeHierarchy extends DefaultTypeHierarchy {
     private final AnnotationMirror varAnnot;
     // TODO: Think this through, add any missing constraints
 
-
     /**
      * Constructs an instance of {@code TypeHierarchy} for the type system
      * whose qualifiers represented in qualifierHierarchy.
@@ -52,6 +50,12 @@ public StructuralEqualityComparer createEqualityComparer() {
         return new InferenceEqualityComparer(this.typeargVisitHistory,
                 InferenceQualifierHierarchy.findVarAnnot(qualifierHierarchy.getTopAnnotations()));
     }
+
+    @Override
+    public boolean isSubtype(
+            final AnnotatedTypeMirror subtype, final AnnotatedTypeMirror supertype) {
+        return isSubtype(subtype, supertype, varAnnot);
+    }
 }
 
 class InferenceEqualityComparer extends StructuralEqualityComparer {