Fix java/unreachable-catch-clause regression

Author: kaspersv

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

@@ -424,6 +424,15 @@ class RefType extends Type, Annotatable, Modifiable, @reftype {
    */
   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() }
+
   /**
    * Gets the source declaration of a direct supertype of this type, excluding itself.
    *

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.getAStrictAncestor() = masked and
+  masking.getAStrictAncestorI() = masked and
   masked = caughtType(try, second) and
   forall(RefType thrownType |
     thrownType = getAThrownExceptionType(try) and