more

wala · Mar 3, 2024 · a83d7b5 · a83d7b5
1 parent 7b7fb64
commit a83d7b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/NullAway.gradle.kts b/build-logic/src/main/kotlin/com/ibm/wala/gradle/NullAway.gradle.kts
@@ -17,8 +17,8 @@ tasks.withType<JavaCompile>().configureEach {
     if (!name.contains("test", true)) {
       error("NullAway")
       errorproneArgs.addAll(
-        "-XepOpt:NullAway:AnnotatedPackages=com.ibm.wala",
-        "-XepOpt:NullAway:JSpecifyMode=true",
+          "-XepOpt:NullAway:AnnotatedPackages=com.ibm.wala",
+          "-XepOpt:NullAway:JSpecifyMode=true",
       )
     }
   }

diff --git a/util/src/main/java/com/ibm/wala/util/graph/GraphSlicer.java b/util/src/main/java/com/ibm/wala/util/graph/GraphSlicer.java
@@ -226,8 +226,7 @@ public void removeNode(E n) {
 
           private final Map<E, Collection<E>> preds = new HashMap<>();
 
-          private Set<E> getConnected(
-              @Nullable E inst, Function<E, Iterator<? extends E>> fconnected) {
+          private Set<E> getConnected(E inst, Function<E, Iterator<? extends E>> fconnected) {
             Set<E> result = new LinkedHashSet<>();
             Set<E> seenInsts = new HashSet<>();
             Set<E> newInsts = Iterator2Collection.toSet(fconnected.apply(inst));
@@ -253,11 +252,11 @@ private Set<E> getConnected(
             return result;
           }
 
-          private void setPredNodes(@Nullable E N) {
+          private void setPredNodes(E N) {
             preds.put(N, getConnected(N, G::getPredNodes));
           }
 
-          private void setSuccNodes(@Nullable E N) {
+          private void setSuccNodes(E N) {
             succs.put(N, getConnected(N, G::getSuccNodes));
           }
 

diff --git a/util/src/main/java/com/ibm/wala/util/io/RtJar.java b/util/src/main/java/com/ibm/wala/util/io/RtJar.java
@@ -45,8 +45,7 @@ public static void main(String[] args) {
                   try {
                     return new JarFile(object);
                   } catch (IOException e) {
-                    assert false : e.toString();
-                    return null;
+                    throw new RuntimeException(e);
                   }
                 }));