Reduce scope of workaround; fixes #6116

typetools · Aug 10, 2023 · 600920f · 600920f
1 parent 65b1d6f
commit 600920f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/checker/tests/tainting/Issue6116.java b/checker/tests/tainting/Issue6116.java
@@ -0,0 +1,14 @@
+import java.util.Iterator;
+import java.util.function.Consumer;
+
+class Issue6116<T> {
+  private final Iterator<? extends T> it;
+
+  public Issue6116(Iterator<? extends T> iterator) {
+    this.it = iterator;
+  }
+
+  public void test(Consumer<? super T> action) {
+    it.forEachRemaining(action);
+  }
+}
diff --git a/framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java b/framework/src/main/java/org/checkerframework/framework/type/DefaultTypeHierarchy.java
@@ -1001,8 +1001,10 @@ public Boolean visitTypevar_Typevar(
       // This should be removed when 979 is fixed.
       // This case happens when the captured type variables should be the same type, but
       // aren't because type argument inference isn't implemented correctly.
-      return isContainedWithinBounds(
-          subtype, supertype.getLowerBound(), supertype.getUpperBound(), false);
+      if (isContainedWithinBounds(
+          subtype, supertype.getLowerBound(), supertype.getUpperBound(), false)) {
+        return true;
+      }
     }
 
     if (supertype.getLowerBound().getKind() != TypeKind.NULL) {