Use BugInCF instead of Error

eisop · Nov 3, 2021 · fb592b2 · fb592b2
1 parent b57bb13
commit fb592b2
Show file tree

Hide file tree

Showing 20 changed files with 3,855 additions and 3,980 deletions.
diff --git a/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java b/dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
@@ -1775,7 +1775,7 @@ public Node visitCompoundAssignment(CompoundAssignmentTree tree, Void p) {
           targetRHS = unbox(targetLHS);
           value = unbox(value);
         } else {
-          throw new BugInCF("Both argument to logical operation must be numeric or boolean");
+          throw new BugInCF("Both arguments to logical operation must be numeric or boolean");
         }
 
         BinaryTree operTree =

diff --git a/dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/Constant.java b/dataflow/src/main/java/org/checkerframework/dataflow/constantpropagation/Constant.java
@@ -119,7 +119,7 @@ public String toString() {
         assert isConstant() : "@AssumeAssertion(nullness)";
         return value.toString();
       default:
-        throw new BugInCF("Unexpected type");
+        throw new BugInCF("Unexpected type: " + type);
     }
   }
 }
diff --git a/dataflow/src/main/java/org/checkerframework/dataflow/expression/FieldAccess.java b/dataflow/src/main/java/org/checkerframework/dataflow/expression/FieldAccess.java
@@ -8,6 +8,7 @@
 import org.checkerframework.dataflow.analysis.Store;
 import org.checkerframework.dataflow.cfg.node.FieldAccessNode;
 import org.checkerframework.javacutil.AnnotationProvider;
+import org.checkerframework.javacutil.BugInCF;
 import org.checkerframework.javacutil.ElementUtils;
 import org.checkerframework.javacutil.TypesUtils;
 
@@ -72,8 +73,8 @@ public FieldAccess(JavaExpression receiver, TypeMirror type, VariableElement fie
     this.field = fieldElement;
     String fieldName = fieldElement.toString();
     if (fieldName.equals("class") || fieldName.equals("this")) {
-      Error e =
-          new Error(
+      BugInCF e =
+          new BugInCF(
               String.format(
                   "bad field name \"%s\" in new FieldAccess(%s, %s, %s)%n",
                   fieldName, receiver, type, fieldElement));

diff --git a/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java b/framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java
@@ -1554,7 +1554,7 @@ private boolean isTypeAnnotation(AnnotationTree anno) {
         annoSymbol = (ClassSymbol) ((JCFieldAccess) annoType).sym;
         break;
       default:
-        throw new Error("Unhandled kind: " + annoType.getKind() + " for " + anno);
+        throw new BugInCF("Unhandled kind: " + annoType.getKind() + " for " + anno);
     }
     for (AnnotationMirror metaAnno : annoSymbol.getAnnotationMirrors()) {
       if (AnnotationUtils.areSameByName(metaAnno, TARGET)) {