Fix NPE in CFAbstractValue

checker/tests/resourceleak/Issue7217.java

@@ -0,0 +1,13 @@
+import java.util.Collection;
+
+class Issue7217<E extends Enum<E>> {
+
+  /**
+   * This method triggers a Least Upper Bound (LUB) merge of two collections of a captured type
+   * variable E. * Before the fix, the ternary operator causes the Resource Leak Checker to crash
+   * with a NullPointerException in CFAbstractValue.
+   */
+  void test(boolean b, Collection<E> c1, Collection<E> c2) {
+    Object x = b ? c1 : c2;
+  }
+}

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

@@ -405,6 +405,9 @@ private final AnnotationMirror lowestQualifier(AnnotationMirror qual1, Annotatio
         AnnotatedTypeVariable typeVar,
         AnnotationMirror top,
         boolean canCombinedSetBeMissingAnnos) {
+      if (typeVar == null) {
+        return annotation;
+      }
 
       AnnotationMirror upperBound = typeVar.getEffectiveAnnotationInHierarchy(top);
       TypeMirror upperBoundTM = typeVar.getUpperBound().getUnderlyingType();
@@ -591,6 +594,9 @@ public ValueLub(boolean shouldWiden) {
         AnnotatedTypeVariable typeVar,
         AnnotationMirror top,
         boolean canCombinedSetBeMissingAnnos) {
+      if (typeVar == null) {
+        return annotation;
+      }
       TypeMirror typeVarTM = typeVar.getUnderlyingType();
       if (canCombinedSetBeMissingAnnos) {
         // anno is the primary annotation on the use of a type variable. typeVar is a use of
@@ -700,6 +706,9 @@ protected class ValueGlb extends AnnotationSetCombiner {
         AnnotatedTypeVariable typeVar,
         AnnotationMirror top,
         boolean canCombinedSetBeMissingAnnos) {
+      if (typeVar == null) {
+        return annotation;
+      }
       TypeMirror typeVarTM = typeVar.getUnderlyingType();
       if (canCombinedSetBeMissingAnnos) {
         // anno is the primary annotation on the use of a type variable. typeVar is a use of