WIP

Author: kaspersv

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

@@ -417,21 +417,14 @@ 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.
-   * This does not include itself, unless this type is part of a cycle
-   * in the type hierarchy.
-   */
-  RefType getAStrictAncestor() { result = this.getASupertype().getAnAncestor() }
-
   /**
    * Gets a direct or indirect supertype of this type.
    * This does not include itself, unless this type is part of a cycle
    * in the type hierarchy.
    */
   overlay[caller?]
   pragma[inline]
-  RefType getAStrictAncestorI() { result = this.getASupertype().getAnAncestor() }
+  RefType getAStrictAncestor() { result = this.getASupertype().getAnAncestor() }
 
   /**
    * Gets the source declaration of a direct supertype of this type, excluding itself.

java/ql/src/Likely Bugs/Inheritance/NoNonFinalInConstructor.ql

@@ -47,13 +47,13 @@ where
   ma = unqualifiedCallToNonAbstractMethod(c, m) and
   // ... there exists an overriding method in a subtype,
   n.overrides+(m) and
-  n.getDeclaringType().getAStrictAncestorI() = c.getDeclaringType() and
+  n.getDeclaringType().getAStrictAncestor() = c.getDeclaringType() and
   // ... the method is in a supertype of c,
   m.getDeclaringType() = c.getDeclaringType().getAnAncestor() and
   // ... `n` reads a non-final field `f`,
   fa = nonFinalFieldRead(n, f) and
   // ... which is declared in a subtype of `c`,
-  f.getDeclaringType().getAStrictAncestorI() = c.getDeclaringType() and
+  f.getDeclaringType().getAStrictAncestor() = c.getDeclaringType() and
   // ... `f` is written only in the subtype constructor, and
   fw = fieldWriteOnlyIn(d, f) and
   // ... the subtype constructor calls (possibly indirectly) the offending super constructor.

java/ql/src/Likely Bugs/Statements/PartiallyMaskedCatch.ql

@@ -89,7 +89,7 @@ from TryStmt try, int first, int second, RefType masking, RefType masked, string
 where
   try.getFile().isJavaSourceFile() and
   masking = caughtType(try, first) and
-  masking.getAStrictAncestorI() = masked and
+  masking.getAStrictAncestor() = masked and
   masked = caughtType(try, second) and
   forall(RefType thrownType |
     thrownType = getAThrownExceptionType(try) and