Code review

Co-authored-by: Michael Ernst <mernst@cs.washington.edu>

Author: mernstcheckerframework

framework/src/main/java/org/checkerframework/framework/util/AtmLubVisitor.java

@@ -141,7 +141,7 @@ private void lubPrimaryAnnotations(
       lubSet =
           qualHierarchy.leastUpperBoundsShallow(
               type1.getPrimaryAnnotations(),
-              type2.getUnderlyingType(),
+              type1.getUnderlyingType(),
               type2.getPrimaryAnnotations(),
               type2.getUnderlyingType());
     }

framework/src/main/java/org/checkerframework/framework/util/DefaultQualifierKindHierarchy.java

@@ -462,7 +462,7 @@ protected void initializeQualifierKindFields(
         }
         if (qualifierKind.bottom == null) {
           qualifierKind.bottom = bot;
-        } else if (qualifierKind.top != bot) {
+        } else if (qualifierKind.bottom != bot) {
           throw new TypeSystemError(
               "Multiple bottoms found for qualifier %s. Bottoms: %s and %s.",
               qualifierKind, bot, qualifierKind.bottom);

framework/src/main/java/org/checkerframework/framework/util/TypeArgumentMapper.java

@@ -170,6 +170,7 @@ public static Map<TypeParameterElement, Set<TypeParameterElement>> mapTypeArgume
           addToSetMap(intermediate, (TypeParameterElement) typeArgEle, correspondingParameter);
         }
       }
+      current = next;
     }
 
     List<? extends TypeParameterElement> supertypeParams = supertype.getTypeParameters();
@@ -198,7 +199,7 @@ private static Set<TypeParameterElement> flattenPath(
     for (TypeParameterElement oldElement : elements) {
       Set<TypeParameterElement> substitutions = map.get(oldElement);
       if (substitutions != null) {
-        result.addAll(flattenPath(elements, map));
+        result.addAll(flattenPath(substitutions, map));
       } else {
         result.add(oldElement);
       }