Skip to content

Commit 950c719

Browse files
MichaelRFairhurstMichaelRFairhurst
authored
Merge pull request #913 from github/codeql/upgrade-to-2.20.7
Upgrade `github/codeql` dependency to 2.20.7
2 parents 3ecaa82 + fe9a48d commit 950c719

File tree

41 files changed

+290
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+290
-270
lines changed

‎c/cert/src/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 2.1.1
5+
version: 4.0.3
66
codeql/dataflow:
7-
version: 1.1.6
7+
version: 2.0.3
88
codeql/mad:
9-
version: 1.0.12
9+
version: 1.0.19
1010
codeql/rangeanalysis:
11-
version: 1.0.12
11+
version: 1.0.19
1212
codeql/ssa:
13-
version: 1.0.12
13+
version: 1.0.19
1414
codeql/tutorial:
15-
version: 1.0.12
15+
version: 1.0.19
1616
codeql/typeflow:
17-
version: 1.0.12
17+
version: 1.0.19
1818
codeql/typetracking:
19-
version: 1.0.12
19+
version: 2.0.3
2020
codeql/util:
21-
version: 1.0.12
21+
version: 2.0.6
2222
codeql/xml:
23-
version: 1.0.12
23+
version: 1.0.19
2424
compiled: false

‎c/cert/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ license: MIT
66
default-suite-file: codeql-suites/cert-c-default.qls
77
dependencies:
88
codeql/common-c-coding-standards: '*'
9-
codeql/cpp-all: 2.1.1
9+
codeql/cpp-all: 4.0.3

‎c/cert/src/rules/DCL40-C/IncompatibleFunctionDeclarations.ql

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,32 @@ import codingstandards.c.cert
2424
import codingstandards.cpp.types.Compatible
2525
import ExternalIdentifiers
2626

27-
predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
27+
predicate interestedInFunctions(
28+
FunctionDeclarationEntry f1, FunctionDeclarationEntry f2, ExternalIdentifiers d
29+
) {
2830
not f1 = f2 and
29-
f1.getDeclaration() = f2.getDeclaration() and
30-
f1.getName() = f2.getName()
31+
d = f1.getDeclaration() and
32+
d = f2.getDeclaration()
33+
}
34+
35+
predicate interestedInFunctions(FunctionDeclarationEntry f1, FunctionDeclarationEntry f2) {
36+
interestedInFunctions(f1, f2, _)
3137
}
3238

39+
module FuncDeclEquiv =
40+
FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>;
41+
3342
from ExternalIdentifiers d, FunctionDeclarationEntry f1, FunctionDeclarationEntry f2
3443
where
3544
not isExcluded(f1, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
3645
not isExcluded(f2, Declarations2Package::incompatibleFunctionDeclarationsQuery()) and
37-
not f1 = f2 and
38-
f1.getDeclaration() = d and
39-
f2.getDeclaration() = d and
40-
f1.getName() = f2.getName() and
46+
interestedInFunctions(f1, f2, d) and
4147
(
4248
//return type check
43-
not FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>::equalReturnTypes(f1,
44-
f2)
49+
not FuncDeclEquiv::equalReturnTypes(f1, f2)
4550
or
4651
//parameter type check
47-
not FunctionDeclarationTypeEquivalence<TypesCompatibleConfig, interestedInFunctions/2>::equalParameterTypes(f1,
48-
f2)
52+
not FuncDeclEquiv::equalParameterTypes(f1, f2)
4953
) and
5054
// Apply ordering on start line, trying to avoid the optimiser applying this join too early
5155
// in the pipeline

‎c/cert/src/rules/EXP16-C/DoNotCompareFunctionPointersToConstantValues.ql

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ import codingstandards.cpp.types.FunctionType
2323
import codingstandards.cpp.exprs.FunctionExprs
2424
import codingstandards.cpp.exprs.Guards
2525

26-
abstract class EffectivelyComparison extends Element {
26+
final class FinalElement = Element;
27+
28+
abstract class EffectivelyComparison extends FinalElement {
2729
abstract string getExplanation();
2830

2931
abstract FunctionExpr getFunctionExpr();
3032
}
3133

32-
class ExplicitComparison extends EffectivelyComparison, ComparisonOperation {
34+
final class FinalComparisonOperation = ComparisonOperation;
35+
36+
class ExplicitComparison extends EffectivelyComparison, FinalComparisonOperation {
3337
Expr constantExpr;
3438
FunctionExpr funcExpr;
3539

‎c/cert/test/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 2.1.1
5+
version: 4.0.3
66
codeql/dataflow:
7-
version: 1.1.6
7+
version: 2.0.3
88
codeql/mad:
9-
version: 1.0.12
9+
version: 1.0.19
1010
codeql/rangeanalysis:
11-
version: 1.0.12
11+
version: 1.0.19
1212
codeql/ssa:
13-
version: 1.0.12
13+
version: 1.0.19
1414
codeql/tutorial:
15-
version: 1.0.12
15+
version: 1.0.19
1616
codeql/typeflow:
17-
version: 1.0.12
17+
version: 1.0.19
1818
codeql/typetracking:
19-
version: 1.0.12
19+
version: 2.0.3
2020
codeql/util:
21-
version: 1.0.12
21+
version: 2.0.6
2222
codeql/xml:
23-
version: 1.0.12
23+
version: 1.0.19
2424
compiled: false

‎c/common/src/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 2.1.1
5+
version: 4.0.3
66
codeql/dataflow:
7-
version: 1.1.6
7+
version: 2.0.3
88
codeql/mad:
9-
version: 1.0.12
9+
version: 1.0.19
1010
codeql/rangeanalysis:
11-
version: 1.0.12
11+
version: 1.0.19
1212
codeql/ssa:
13-
version: 1.0.12
13+
version: 1.0.19
1414
codeql/tutorial:
15-
version: 1.0.12
15+
version: 1.0.19
1616
codeql/typeflow:
17-
version: 1.0.12
17+
version: 1.0.19
1818
codeql/typetracking:
19-
version: 1.0.12
19+
version: 2.0.3
2020
codeql/util:
21-
version: 1.0.12
21+
version: 2.0.6
2222
codeql/xml:
23-
version: 1.0.12
23+
version: 1.0.19
2424
compiled: false

‎c/common/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ version: 2.49.0-dev
33
license: MIT
44
dependencies:
55
codeql/common-cpp-coding-standards: '*'
6-
codeql/cpp-all: 2.1.1
6+
codeql/cpp-all: 4.0.3

‎c/common/test/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 2.1.1
5+
version: 4.0.3
66
codeql/dataflow:
7-
version: 1.1.6
7+
version: 2.0.3
88
codeql/mad:
9-
version: 1.0.12
9+
version: 1.0.19
1010
codeql/rangeanalysis:
11-
version: 1.0.12
11+
version: 1.0.19
1212
codeql/ssa:
13-
version: 1.0.12
13+
version: 1.0.19
1414
codeql/tutorial:
15-
version: 1.0.12
15+
version: 1.0.19
1616
codeql/typeflow:
17-
version: 1.0.12
17+
version: 1.0.19
1818
codeql/typetracking:
19-
version: 1.0.12
19+
version: 2.0.3
2020
codeql/util:
21-
version: 1.0.12
21+
version: 2.0.6
2222
codeql/xml:
23-
version: 1.0.12
23+
version: 1.0.19
2424
compiled: false

‎c/misra/src/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 2.1.1
5+
version: 4.0.3
66
codeql/dataflow:
7-
version: 1.1.6
7+
version: 2.0.3
88
codeql/mad:
9-
version: 1.0.12
9+
version: 1.0.19
1010
codeql/rangeanalysis:
11-
version: 1.0.12
11+
version: 1.0.19
1212
codeql/ssa:
13-
version: 1.0.12
13+
version: 1.0.19
1414
codeql/tutorial:
15-
version: 1.0.12
15+
version: 1.0.19
1616
codeql/typeflow:
17-
version: 1.0.12
17+
version: 1.0.19
1818
codeql/typetracking:
19-
version: 1.0.12
19+
version: 2.0.3
2020
codeql/util:
21-
version: 1.0.12
21+
version: 2.0.6
2222
codeql/xml:
23-
version: 1.0.12
23+
version: 1.0.19
2424
compiled: false

‎c/misra/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ license: MIT
66
default-suite-file: codeql-suites/misra-c-default.qls
77
dependencies:
88
codeql/common-c-coding-standards: '*'
9-
codeql/cpp-all: 2.1.1
9+
codeql/cpp-all: 4.0.3

0 commit comments

Comments
 (0)