hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 19:26:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7470 from hvitved/csharp/dispatch-join-order

Browse Source 
C#: Fix bad join-order in dispatch library
This commit is contained in:
Tom Hvitved
2021-12-22 19:11:33 +01:00
committed by GitHub
parent 0cbf136e21 f5471e34f8
commit 882caf4011
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
View File

@@ -233,18 +233,23 @@ private module Internal {
}
pragma[noinline]
private predicate hasOverrider(OverridableCallable oc, Gvn::GvnType t) {
private predicate hasOverrider(Gvn::GvnType t, OverridableCallable oc) {
exists(oc.getAnOverrider(any(ValueOrRefType t0 | Gvn::getGlobalValueNumber(t0) = t)))
}
pragma[noinline]
private predicate hasCallable(OverridableCallable source, Gvn::GvnType t, OverridableCallable c) {
private predicate hasCallable0(Gvn::GvnType t, OverridableCallable c, OverridableCallable source) {
c.getUnboundDeclaration() = source and
any(ValueOrRefType t0 | Gvn::getGlobalValueNumber(t0) = t).hasCallable(c) and
hasOverrider(c, t) and
source = any(DispatchMethodOrAccessorCall call).getAStaticTargetExt()
}
pragma[noinline]
private predicate hasCallable(Gvn::GvnType t, OverridableCallable c, OverridableCallable source) {
hasCallable0(t, c, source) and
hasOverrider(t, c)
}
abstract private class DispatchMethodOrAccessorCall extends DispatchCallImpl {
pragma[noinline]
OverridableCallable getAStaticTargetExt() {
@@ -260,7 +265,7 @@ private module Internal {
pragma[noinline]
private predicate hasSubsumedQualifierType(Gvn::GvnType t) {
hasOverrider(_, t) and
hasOverrider(t, _) and
exists(Type t0 |
t0 = getAPossibleType(this.getQualifier(), false) and
not t0 instanceof TypeParameter
@@ -287,7 +292,7 @@ private module Internal {
pragma[nomagic]
predicate hasSubsumedQualifierTypeOverridden(Gvn::GvnType t, OverridableCallable c) {
this.hasSubsumedQualifierType(t) and
hasCallable(any(OverridableCallable oc | oc = this.getAStaticTargetExt()), t, c)
hasCallable(t, c, any(OverridableCallable oc | oc = this.getAStaticTargetExt()))
}
/**
@@ -553,7 +558,7 @@ private module Internal {
pragma[nomagic]
private predicate contextArgHasSubsumedType(DispatchCall ctx, Gvn::GvnType t) {
hasOverrider(_, t) and
hasOverrider(t, _) and
exists(Gvn::GvnType t0 | this.contextArgHasNonTypeParameterType(ctx, t0) |
t = t0
or