C#: Disregard destructors in model generation.

michaelnebel · michaelnebel · commit 87c7dd90c0d5 · 2022-08-24T09:46:54.000+02:00
diff --git a/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -36,7 +36,8 @@ private predicate isRelevantForModels(CS::Callable api) {
   api.getDeclaringType().getNamespace().getQualifiedName() != "" and
   not api instanceof CS::ConversionOperator and
   not api instanceof Util::MainMethod and
-  not isHigherOrder(api)
+  not isHigherOrder(api) and
+  not api instanceof CS::Destructor
 }
 
 /**
diff --git a/csharp/ql/test/utils/model-generator/Summaries.cs b/csharp/ql/test/utils/model-generator/Summaries.cs
@@ -6,6 +6,9 @@ namespace Summaries;
 
 public class BasicFlow
 {
+    // No flow summary and no negative summary either.
+    ~BasicFlow() { }
+
     private string tainted;
 
     public BasicFlow ReturnThis(object input)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ private predicate isRelevantForModels(CS::Callable api) {`
`36`	`36`	`api.getDeclaringType().getNamespace().getQualifiedName() != "" and`
`37`	`37`	`not api instanceof CS::ConversionOperator and`
`38`	`38`	`not api instanceof Util::MainMethod and`
`39`		`- not isHigherOrder(api)`
	`39`	`+ not isHigherOrder(api) and`
	`40`	`+ not api instanceof CS::Destructor`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@ namespace Summaries;`
`6`	`6`
`7`	`7`	`public class BasicFlow`
`8`	`8`	`{`
	`9`	`+ // No flow summary and no negative summary either.`
	`10`	`+ ~BasicFlow() { }`
	`11`	`+`
`9`	`12`	`private string tainted;`
`10`	`13`
`11`	`14`	`public BasicFlow ReturnThis(object input)`