Change up syntax to see if impossible `ArrayIndexOutOfBoundsException…

…` goes away. PiperOrigin-RevId: 354582499
bazelbuild · Jan 29, 2021 · 9c5124f · 9c5124f
1 parent 9a0bcbb
commit 9c5124f
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSet.java
@@ -733,15 +733,13 @@ private int walk(
   private static <E> int replay(
       ImmutableList.Builder<E> output, Object[] children, byte[] memo, int pos) {
     for (Object child : children) {
-      if ((memo[pos >> 3] & (1 << (pos & 7))) != 0) {
-        if (child instanceof Object[]) {
-          pos = replay(output, (Object[]) child, memo, pos + 1);
-        } else {
-          output.add((E) child);
-          ++pos;
-        }
+      if ((memo[pos >> 3] & (1 << (pos & 7))) == 0) {
+        pos++;
+      } else if (child instanceof Object[]) {
+        pos = replay(output, (Object[]) child, memo, pos + 1);
       } else {
-        ++pos;
+        output.add((E) child);
+        pos++;
       }
     }
     return pos;