Enable model inheritence by subinterfaces

smowton · smowton · commit 53723479c829 · 2023-04-12T14:19:00.000+01:00
Previously only a concrete (non-interface) method could inherit such a model
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
@@ -533,9 +533,20 @@ class Method extends Function {
    * implement themselves.
    */
   predicate implements(Method m) {
+    if this.isInterfaceMethod() then this = m else implementsIncludingInterfaceMethods(m)
+  }
+
+  /**
+   * Holds if this method implements the method `m`, that is, if `m` is a method
+   * on an interface, and this is a method with the same name on a type that
+   * implements that interface.
+   *
+   * Note that all methods implement themselves, and that unlike the predicate `implements`
+   * this does allow interface methods to implement other interfaces.
+   */
+  predicate implementsIncludingInterfaceMethods(Method m) {
     this = m
     or
-    not this.isInterfaceMethod() and
     exists(Type t |
       this = t.getMethod(m.getName()) and
       t.implements(m.getReceiverType().getUnderlyingType())
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -287,7 +287,7 @@ SourceOrSinkElement interpretElement(
     exists(Method m | m.hasQualifiedName(interpretPackage(pkg), type, name) |
       result.asEntity() = m
       or
-      subtypes = true and result.asEntity().(Method).implements(m)
+      subtypes = true and result.asEntity().(Method).implementsIncludingInterfaceMethods(m)
     )
     or
     type = "" and

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ SourceOrSinkElement interpretElement(`
`287`	`287`	`exists(Method m \| m.hasQualifiedName(interpretPackage(pkg), type, name) \|`
`288`	`288`	`result.asEntity() = m`
`289`	`289`	`or`
`290`		`- subtypes = true and result.asEntity().(Method).implements(m)`
	`290`	`+ subtypes = true and result.asEntity().(Method).implementsIncludingInterfaceMethods(m)`
`291`	`291`	`)`
`292`	`292`	`or`
`293`	`293`	`type = "" and`