hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-02 12:15:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6630 from tamasvajk/feature/interface-runtimecallable

Browse Source 
C# Extend runtime callables to cover interface members with default implementation
This commit is contained in:
Tamás Vajk
2021-09-09 17:24:55 +02:00
committed by GitHub
parent 4c74709019 9ab6c29cd3
commit ad04099ac2
5 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
csharp/ql/lib/semmle/code/csharp/dispatch/RuntimeCallable.qll
View File

@@ -15,7 +15,10 @@ private import dotnet
class RuntimeCallable extends DotNet::Callable {
RuntimeCallable() {
not this.(Modifiable).isAbstract() and
not getDeclaringType() instanceof Interface
(
not getDeclaringType() instanceof Interface or
this.(Virtualizable).isVirtual()
)
}
}

2
csharp/ql/test/library-tests/dispatch/CallGraph.expected
View File

@@ -236,3 +236,5 @@
| ViableCallable.cs:452:10:452:14 | M4<> | ViableCallable.cs:444:23:444:27 | M2<> |
| ViableCallable.cs:458:10:458:14 | M5<> | ViableCallable.cs:430:22:430:26 | M2<> |
| ViableCallable.cs:458:10:458:14 | M5<> | ViableCallable.cs:444:23:444:27 | M2<> |
| ViableCallable.cs:475:10:475:12 | Run | ViableCallable.cs:468:10:468:11 | M2 |
| ViableCallable.cs:475:10:475:12 | Run | ViableCallable.cs:473:17:473:18 | M1 |

2
csharp/ql/test/library-tests/dispatch/GetADynamicTarget.expected
View File

@@ -469,3 +469,5 @@
| ViableCallable.cs:455:9:455:30 | call to method M2<T> | C17.M2<T>(Func<T>) |
| ViableCallable.cs:461:9:461:30 | call to method M2<T> | C16<T,System.Int32>.M2<T>(Func<T>) |
| ViableCallable.cs:461:9:461:30 | call to method M2<T> | C17.M2<T>(Func<T>) |
| ViableCallable.cs:478:9:478:14 | call to method M1 | C18.M1() |
| ViableCallable.cs:481:9:481:14 | call to method M2 | I2.M2() |

20
csharp/ql/test/library-tests/dispatch/ViableCallable.cs
View File

@@ -461,3 +461,23 @@ class C17 : C16<string, int>
c.M2(() => default(T));
}
}
interface I2
{
void M1();
void M2() => throw null;
}
class C18 : I2
{
public void M1() { }
void Run(I2 i)
{
// Viable callables: C18.M1()
i.M1();
// Viable callables: I2.M2()
i.M2();
}
}

2
csharp/ql/test/library-tests/dispatch/viableCallable.expected
View File

@@ -251,3 +251,5 @@
| ViableCallable.cs:419:9:419:21 | call to method M<String> | M<> | A4 |
| ViableCallable.cs:423:9:423:21 | call to method M<String> | M<> | A4 |
| ViableCallable.cs:423:9:423:21 | call to method M<String> | M<> | A5 |
| ViableCallable.cs:478:9:478:14 | call to method M1 | M1 | C18 |
| ViableCallable.cs:481:9:481:14 | call to method M2 | M2 | I2 |