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

Fix generic type constraint order

Browse Source
This commit is contained in:
Tamas Vajk
2021-04-16 17:13:24 +02:00
parent 9b6e9ab148
commit bd83f74dca
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
csharp/ql/src/Stubs/Stubs.qll
View File

@@ -425,20 +425,20 @@ private string stubGenericMethodParams(Method m) {
else result = ""
}
private string stubConstraints(TypeParameterConstraints tpc) {
tpc.hasConstructorConstraint() and result = "new()"
private string stubConstraints(TypeParameterConstraints tpc, int i) {
tpc.hasConstructorConstraint() and result = "new()" and i = 2
or
tpc.hasUnmanagedTypeConstraint() and result = "unmanaged"
tpc.hasUnmanagedTypeConstraint() and result = "unmanaged" and i = 0
or
tpc.hasValueTypeConstraint() and result = "struct"
tpc.hasValueTypeConstraint() and result = "struct" and i = 0
or
tpc.hasRefTypeConstraint() and result = "class"
tpc.hasRefTypeConstraint() and result = "class" and i = 0
or
result = tpc.getATypeConstraint().(TypeParameter).getName()
result = tpc.getATypeConstraint().(TypeParameter).getName() and i = 1
or
result = stubClassName(tpc.getATypeConstraint().(Interface))
result = stubClassName(tpc.getATypeConstraint().(Interface)) and i = 1
or
result = stubClassName(tpc.getATypeConstraint().(Class))
result = stubClassName(tpc.getATypeConstraint().(Class)) and i = 1
}
private string stubTypeParameterConstraints(TypeParameter tp) {
@@ -456,7 +456,7 @@ private string stubTypeParameterConstraints(TypeParameter tp) {
exists(TypeParameterConstraints tpc | tpc = tp.getConstraints() |
result =
" where " + tp.getName() + ": " +
strictconcat(string s | s = stubConstraints(tpc) | s, ", ")
strictconcat(string s, int i | s = stubConstraints(tpc, i) | s, ", " order by i)
)
}