Merge pull request #9545 from igfoo/igfoo/type_cycles

Java: Fix RefType.getAStrictAncestor() in the presence of type hierarchy cycles

Author: igfoo

java/ql/lib/semmle/code/java/Type.qll

@@ -413,8 +413,12 @@ class RefType extends Type, Annotatable, Modifiable, @reftype {
   /** Gets a direct or indirect supertype of this type, including itself. */
   RefType getAnAncestor() { hasDescendant(result, this) }
 
-  /** Gets a direct or indirect supertype of this type, not including itself. */
-  RefType getAStrictAncestor() { result = this.getAnAncestor() and result != this }
+  /**
+   * Gets a direct or indirect supertype of this type.
+   * This does not including itself, unless this type is part of a cycle
+   * in the type hierarchy.
+   */
+  RefType getAStrictAncestor() { result = this.getASupertype().getAnAncestor() }
 
   /**
    * Gets the source declaration of a direct supertype of this type, excluding itself.

java/ql/test/library-tests/types/cycles/Test.java

@@ -0,0 +1,2 @@
+public class Test {
+}

java/ql/test/library-tests/types/cycles/cycles.expected

@@ -0,0 +1,6 @@
+| BiFunction<? super Object,? super Object,? extends Object> |
+| BiFunction<? super Object,? super Object,?> |
+| Function<? super Object,? extends Object> |
+| Function<? super Object,?> |
+| Map<? extends Object,? extends Object> |
+| Map<?,?> |

java/ql/test/library-tests/types/cycles/cycles.ql

@@ -0,0 +1,5 @@
+import java
+
+from RefType t
+where t = t.getAStrictAncestor()
+select t.toString()