C#: Adjust Callable::canReturn to handle Task-like async return types

tamasvajk · tamasvajk · commit 0b1705f302d1 · 2021-03-17T09:25:57.000+01:00
diff --git a/csharp/ql/src/semmle/code/csharp/Callable.qll b/csharp/ql/src/semmle/code/csharp/Callable.qll
@@ -11,7 +11,6 @@ private import dotnet
 private import semmle.code.csharp.ExprOrStmtParent
 private import semmle.code.csharp.metrics.Complexity
 private import TypeRef
-private import semmle.code.csharp.frameworks.system.threading.Tasks
 
 /**
  * An element that can be called.
@@ -210,7 +209,7 @@ class Callable extends DotNet::Callable, Parameterizable, ExprOrStmtParent, @cal
     not this.getReturnType() instanceof VoidType and
     (
       not this.(Modifiable).isAsync() or
-      not this.getReturnType() instanceof SystemThreadingTasksTaskClass
+      this.getReturnType() instanceof Generic
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ private import dotnet`
`11`	`11`	`private import semmle.code.csharp.ExprOrStmtParent`
`12`	`12`	`private import semmle.code.csharp.metrics.Complexity`
`13`	`13`	`private import TypeRef`
`14`		`-private import semmle.code.csharp.frameworks.system.threading.Tasks`
`15`	`14`
`16`	`15`	`/**`
`17`	`16`	`* An element that can be called.`
`@@ -210,7 +209,7 @@ class Callable extends DotNet::Callable, Parameterizable, ExprOrStmtParent, @cal`
`210`	`209`	`not this.getReturnType() instanceof VoidType and`
`211`	`210`	`(`
`212`	`211`	`not this.(Modifiable).isAsync() or`
`213`		`- not this.getReturnType() instanceof SystemThreadingTasksTaskClass`
	`212`	`+ this.getReturnType() instanceof Generic`
`214`	`213`	`)`
`215`	`214`	`}`
`216`	`215`