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

Merge master into next.

Browse Source
This commit is contained in:
Aditya Sharad
2018-12-13 17:57:31 +00:00
parent 1158708ea4 b21e832ee2
commit f71e5ac338
54 changed files with 515 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
csharp/ql/src/Language Abuse/UselessUpcast.ql
View File

@@ -118,8 +118,9 @@ class ExplicitUpcast extends ExplicitCast {
}
pragma [nomagic]
private predicate isDisambiguatingStaticCall0(StaticCall c, StaticCallable target, ValueOrRefType t) {
private predicate isDisambiguatingStaticCall0(StaticCall c, StaticCallable target, string name, ValueOrRefType t) {
this.isArgument(c, target) and
name = target.getName() and
(
t = c.(QualifiableExpr).getQualifier().getType()
or
@@ -131,9 +132,9 @@ class ExplicitUpcast extends ExplicitCast {
/** Holds if this upcast may be used to disambiguate the target of a static call. */
pragma [nomagic]
private predicate isDisambiguatingStaticCall(StaticCallable other, int args) {
exists(StaticCall c, StaticCallable target, ValueOrRefType t |
this.isDisambiguatingStaticCall0(c, target, t) |
hasStaticCallable(t, other, target.getName()) and
exists(StaticCall c, StaticCallable target, ValueOrRefType t, string name |
this.isDisambiguatingStaticCall0(c, target, name, t) |
hasStaticCallable(t, other, name) and
args = c.getNumberOfArguments() and
other != target
)