C#: Extend SummarizedCallable from FlowSummaryImpl.

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/dataflow/FlowSummary.qll

@@ -153,14 +153,6 @@ abstract class SummarizedCallable extends DotNet::Callable {
   predicate clearsContent(ParameterPosition pos, DataFlow::ContentSet content) { none() }
 }
 
-private predicate recordConstructorFlow(Constructor c, int i, Property p) {
-  c = any(RecordType r).getAMember() and
-  exists(string name |
-    c.getParameter(i).getName() = name and
-    c.getDeclaringType().getAMember(name) = p
-  )
-}
-
 private class SummarizedCallableAdapter extends Impl::Public::SummarizedCallable {
   private SummarizedCallable sc;
 
@@ -177,14 +169,22 @@ private class SummarizedCallableAdapter extends Impl::Public::SummarizedCallable
   }
 }
 
-private class RecordConstructorFlow extends SummarizedCallable {
-  RecordConstructorFlow() { recordConstructorFlow(this, _, _) }
+private predicate recordConstructorFlow(Constructor c, int i, Property p) {
+  c = any(RecordType r).getAMember() and
+  exists(string name |
+    c.getParameter(i).getName() = name and
+    c.getDeclaringType().getAMember(name) = p
+  )
+}
+
+private class RecordConstructorFlow extends Impl::Public::SummarizedCallable {
+  RecordConstructorFlow() { recordConstructorFlow(this.asCallable(), _, _) }
 
   override predicate propagatesFlow(
     SummaryComponentStack input, SummaryComponentStack output, boolean preservesValue
   ) {
     exists(int i, Property p |
-      recordConstructorFlow(this, i, p) and
+      recordConstructorFlow(this.asCallable(), i, p) and
       input = SummaryComponentStack::argument(i) and
       output = SummaryComponentStack::propertyOf(p, SummaryComponentStack::return()) and
       preservesValue = true

csharp/ql/lib/semmle/code/csharp/frameworks/EntityFramework.qll

@@ -10,6 +10,7 @@ private import semmle.code.csharp.frameworks.system.collections.Generic
 private import semmle.code.csharp.frameworks.Sql
 private import semmle.code.csharp.dataflow.FlowSummary
 private import semmle.code.csharp.dataflow.ExternalFlow
+private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as Impl
 private import semmle.code.csharp.dataflow.internal.DataFlowPrivate as DataFlowPrivate
 
 /**
@@ -88,7 +89,7 @@ module EntityFramework {
   }
 
   /** A flow summary for EntityFramework. */
-  abstract class EFSummarizedCallable extends SummarizedCallable { }
+  abstract class EFSummarizedCallable extends Impl::Public::SummarizedCallable { }
 
   private class DbSetAddOrUpdateRequiredSummaryComponentStack extends RequiredSummaryComponentStack {
     override predicate required(SummaryComponent head, SummaryComponentStack tail) {
@@ -100,7 +101,7 @@ module EntityFramework {
   private class DbSetAddOrUpdate extends EFSummarizedCallable {
     private boolean range;
 
-    DbSetAddOrUpdate() { this = any(DbSet c).getAnAddOrUpdateMethod(range) }
+    DbSetAddOrUpdate() { this.asCallable() = any(DbSet c).getAnAddOrUpdateMethod(range) }
 
     override predicate propagatesFlow(
       SummaryComponentStack input, SummaryComponentStack output, boolean preservesValue
@@ -173,8 +174,8 @@ module EntityFramework {
   private class RawSqlStringConstructorSummarizedCallable extends EFSummarizedCallable {
     RawSqlStringConstructorSummarizedCallable() {
       exists(RawSqlStringStruct s |
-        this = s.getAConstructor() and
-        this.getNumberOfParameters() > 0
+        this.asCallable() = s.getAConstructor() and
+        this.asCallable().getNumberOfParameters() > 0
       )
     }
 
@@ -189,7 +190,7 @@ module EntityFramework {
 
   private class RawSqlStringConversionSummarizedCallable extends EFSummarizedCallable {
     RawSqlStringConversionSummarizedCallable() {
-      exists(RawSqlStringStruct s | this = s.getAConversionTo())
+      exists(RawSqlStringStruct s | this.asCallable() = s.getAConversionTo())
     }
 
     override predicate propagatesFlow(
@@ -448,7 +449,7 @@ module EntityFramework {
   private class DbContextSaveChanges extends EFSummarizedCallable {
     private DbContextClass c;
 
-    DbContextSaveChanges() { this = c.getASaveChanges() }
+    DbContextSaveChanges() { this.asCallable() = c.getASaveChanges() }
 
     pragma[noinline]
     private predicate input(SummaryComponentStack input, Property mapped) {

csharp/ql/lib/semmle/code/csharp/frameworks/system/Collections.qll

@@ -2,6 +2,7 @@
 
 import csharp
 private import semmle.code.csharp.frameworks.System
+private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as Impl
 private import semmle.code.csharp.dataflow.ExternalFlow
 private import semmle.code.csharp.dataflow.FlowSummary
 
@@ -47,11 +48,11 @@ private class SystemCollectionIEnumerableFlowModelCsv extends SummaryModelCsv {
 }
 
 /** Clear content for Clear methods in all subtypes of `System.Collections.IEnumerable`. */
-private class SystemCollectionsIEnumerableClearFlow extends SummarizedCallable {
+private class SystemCollectionsIEnumerableClearFlow extends Impl::Public::SummarizedCallable {
   SystemCollectionsIEnumerableClearFlow() {
-    this.getDeclaringType().(RefType).getABaseType*() instanceof
+    this.asCallable().getDeclaringType().(RefType).getABaseType*() instanceof
       SystemCollectionsIEnumerableInterface and
-    this.hasName("Clear")
+    this.asCallable().hasName("Clear")
   }
 
   override predicate clearsContent(ParameterPosition pos, DataFlow::ContentSet content) {

csharp/ql/lib/semmle/code/csharp/frameworks/system/Text.qll

@@ -2,6 +2,7 @@
 
 import csharp
 private import semmle.code.csharp.frameworks.System
+private import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as Impl
 private import semmle.code.csharp.dataflow.ExternalFlow
 private import semmle.code.csharp.dataflow.FlowSummary
 
@@ -27,9 +28,9 @@ class SystemTextStringBuilderClass extends SystemTextClass {
 }
 
 /** Clear content for `System.Text.StringBuilder.Clear`. */
-private class SystemTextStringBuilderClearFlow extends SummarizedCallable {
+private class SystemTextStringBuilderClearFlow extends Impl::Public::SummarizedCallable {
   SystemTextStringBuilderClearFlow() {
-    this = any(SystemTextStringBuilderClass s).getAMethod("Clear")
+    this.asCallable() = any(SystemTextStringBuilderClass s).getAMethod("Clear")
   }
 
   override predicate clearsContent(ParameterPosition pos, DataFlow::ContentSet content) {