C#/Java: Lift to unbound generic implementations.

Author: michaelnebel

csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll

@@ -213,7 +213,9 @@ module SummaryModelGeneratorInput implements SummaryModelGeneratorInputSig {
   }
 
   private Callable getARelevantOverrideeOrImplementee(Overridable m) {
-    m.overridesOrImplements(result) and relevant(result)
+    m.fromSource() and
+    exists(Callable c | m.overridesOrImplements(c) and result = c.getUnboundDeclaration()) and
+    relevant(result)
   }
 
   /**

java/ql/src/utils/modelgenerator/internal/CaptureModels.qll

@@ -166,8 +166,8 @@ module SummaryModelGeneratorInput implements SummaryModelGeneratorInputSig {
 
   Parameter asParameter(NodeExtended node) { result = node.asParameter() }
 
-  private J::Method getARelevantOverride(J::Method m) {
-    result = m.getAnOverride() and
+  private J::SrcMethod getARelevantOverride(J::Method m) {
+    result = m.getAnOverride().getSourceDeclaration() and
     relevant(result) and
     // Other exclusions for overrides.
     not m instanceof J::ToStringMethod