C#: Use the external SummarizedCallable implementation.

Author: michaelnebel

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

@@ -153,6 +153,11 @@ abstract class SummarizedCallable extends DotNet::Callable {
    */
   pragma[nomagic]
   predicate clearsContent(ParameterPosition pos, DataFlow::ContentSet content) { none() }
+
+  /**
+   * Holds if the summary is auto generated.
+   */
+  predicate isAutoGenerated() { none() }
 }
 
 private class SummarizedCallableAdapter extends Impl::Public::SummarizedCallable {
@@ -169,6 +174,8 @@ private class SummarizedCallableAdapter extends Impl::Public::SummarizedCallable
   final override predicate clearsContent(ParameterPosition pos, DataFlow::ContentSet content) {
     sc.clearsContent(pos, content)
   }
+
+  final override predicate isAutoGenerated() { sc.isAutoGenerated() }
 }
 
 private predicate recordConstructorFlow(Constructor c, int i, Property p) {
@@ -179,25 +186,23 @@ private predicate recordConstructorFlow(Constructor c, int i, Property p) {
   )
 }
 
-private class RecordConstructorFlow extends Impl::Public::SummarizedCallable {
-  RecordConstructorFlow() { recordConstructorFlow(this.asCallable(), _, _) }
+private class RecordConstructorFlow extends SummarizedCallable {
+  RecordConstructorFlow() { recordConstructorFlow(this, _, _) }
 
   override predicate propagatesFlow(
     SummaryComponentStack input, SummaryComponentStack output, boolean preservesValue
   ) {
     exists(int i, Property p |
-      recordConstructorFlow(this.asCallable(), i, p) and
+      recordConstructorFlow(this, i, p) and
       input = SummaryComponentStack::argument(i) and
       output = SummaryComponentStack::propertyOf(p, SummaryComponentStack::return()) and
       preservesValue = true
     )
   }
 }
 
-private class SummarizedCallableDefaultClearsContent extends Impl::Public::SummarizedCallable {
-  SummarizedCallableDefaultClearsContent() {
-    this instanceof Impl::Public::SummarizedCallable or none()
-  }
+private class SummarizedCallableDefaultClearsContent extends SummarizedCallable {
+  SummarizedCallableDefaultClearsContent() { this instanceof SummarizedCallable or none() }
 
   // By default, we assume that all stores into arguments are definite
   override predicate clearsContent(ParameterPosition pos, DataFlow::ContentSet content) {

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowDispatch.qll

@@ -29,7 +29,7 @@ private predicate summarizedCallable(DataFlowCallable c) {
  */
 DotNet::Callable getCallableForDataFlow(DotNet::Callable c) {
   exists(DotNet::Callable unboundDecl | unboundDecl = c.getUnboundDeclaration() |
-    summarizedCallable(TSummarizedCallable(unboundDecl)) and
+    summarizedCallable(TDotNetCallable(unboundDecl)) and
     result = unboundDecl
     or
     result.hasBody() and

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll

@@ -10,6 +10,7 @@ private import FlowSummaryImplSpecific
 private import DataFlowImplSpecific::Private
 private import DataFlowImplSpecific::Public
 private import DataFlowImplCommon
+private import semmle.code.csharp.dataflow.FlowSummary as FlowSummary
 
 /** Provides classes and predicates for defining flow summaries. */
 module Public {
@@ -1069,7 +1070,7 @@ module Private {
   /** Provides a query predicate for outputting a set of relevant flow summaries. */
   module TestOutput {
     /** A flow summary to include in the `summary/3` query predicate. */
-    abstract class RelevantSummarizedCallable extends SummarizedCallable {
+    abstract class RelevantSummarizedCallable extends FlowSummary::SummarizedCallable {
       /** Gets the string representation of this callable used by `summary/1`. */
       abstract string getCallableCsv();
 

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -98,6 +98,8 @@ private predicate summaryElement0(
 
 private class SummarizedCallableExternal extends FlowSummary::SummarizedCallable {
   SummarizedCallableExternal() { summaryElement0(this, _, _, _, _) }
+
+  override predicate isAutoGenerated() { summaryElement0(this, _, _, _, true) }
 }
 
 /**

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

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

csharp/ql/test/shared/FlowSummaries.qll

@@ -4,10 +4,9 @@ private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 
 abstract class IncludeSummarizedCallable extends RelevantSummarizedCallable {
   IncludeSummarizedCallable() {
-    [this.asCallable().(Modifiable), this.asCallable().(Accessor).getDeclaration()]
-        .isEffectivelyPublic()
+    [this.(Modifiable), this.(Accessor).getDeclaration()].isEffectivelyPublic()
   }
 
   /** Gets a string representing the callable in semi-colon separated format for use in flow summaries. */
-  final override string getCallableCsv() { result = Csv::asPartialModel(this.asCallable()) }
+  final override string getCallableCsv() { result = Csv::asPartialModel(this) }
 }