Avoid nullness errors

Co-authored-by: Michael Ernst <mernst@cs.washington.edu>
typetools · Sep 27, 2023 · e30dfd5 · e30dfd5
1 parent 869386f
commit e30dfd5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/checker/src/main/java/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java b/checker/src/main/java/org/checkerframework/checker/fenum/FenumAnnotatedTypeFactory.java
@@ -75,7 +75,11 @@ protected Set<Class<? extends Annotation>> createSupportedTypeQualifiers() {
       if (!Signatures.isBinaryName(qualName)) {
         throw new UserError("Malformed qualifier \"%s\" in -Aquals", qualName);
       }
-      qualSet.add(loader.loadExternalAnnotationClass(qualName));
+      Class<? extends Annotation> annoClass = loader.loadExternalAnnotationClass(qualName);
+      if (annoClass == null) {
+        throw new UserError("Cannot load qualifier \"%s\" in -Aquals", qualName);
+      }
+      qualSet.add(annoClass);
     }
 
     // load directories of qualifiers

diff --git a/checker/src/main/java/org/checkerframework/checker/interning/InterningVisitor.java b/checker/src/main/java/org/checkerframework/checker/interning/InterningVisitor.java
@@ -209,6 +209,7 @@ public Void visitBinary(BinaryTree tree, Void p) {
   public Void visitMethodInvocation(MethodInvocationTree tree, Void p) {
     if (isInvocationOfEquals(tree)) {
       AnnotatedTypeMirror receiverType = atypeFactory.getReceiverType(tree);
+      assert receiverType != null : "@AssumeAssertion(nullness)";
       AnnotatedTypeMirror comp = atypeFactory.getAnnotatedType(tree.getArguments().get(0));
 
       if (this.checker.getLintOption("dotequals", true)