Skip to content

Commit 6891b52

Browse files
authored
Merge branch 'codeql-cli-2.11.2' into doc-api-graph
2 parents 7c577ae + a42f3fd commit 6891b52

File tree

958 files changed

+15015
-56464
lines changed

Some content is hidden

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

958 files changed

+15015
-56464
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "Swift: Build and test Xcode autobuilder"
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "swift/xcode-autobuilder/**"
7+
- "misc/bazel/**"
8+
- "*.bazel*"
9+
- .github/workflows/swift-autobuilder.yml
10+
branches:
11+
- main
12+
13+
jobs:
14+
autobuilder:
15+
runs-on: macos-latest
16+
steps:
17+
- uses: actions/checkout@v3
18+
- uses: bazelbuild/setup-bazelisk@v2
19+
- uses: actions/setup-python@v4
20+
with:
21+
python-version-file: 'swift/.python-version'
22+
- name: Build the Xcode autobuilder
23+
run: |
24+
bazel build //swift/xcode-autobuilder
25+
- name: Test the Xcode autobuilder
26+
run: |
27+
bazel test //swift/xcode-autobuilder/tests

.github/workflows/swift-codegen.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ on:
1010
- .github/actions/fetch-codeql/action.yml
1111
branches:
1212
- main
13+
defaults:
14+
run:
15+
working-directory: swift
1316

1417
jobs:
1518
codegen:
@@ -18,7 +21,9 @@ jobs:
1821
- uses: actions/checkout@v3
1922
- uses: ./.github/actions/fetch-codeql
2023
- uses: bazelbuild/setup-bazelisk@v2
21-
- uses: actions/setup-python@v3
24+
- uses: actions/setup-python@v4
25+
with:
26+
python-version-file: 'swift/.python-version'
2227
- uses: pre-commit/[email protected]
2328
name: Check that python code is properly formatted
2429
with:

.github/workflows/swift-integration-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ jobs:
2828
- uses: actions/checkout@v3
2929
- uses: ./.github/actions/fetch-codeql
3030
- uses: bazelbuild/setup-bazelisk@v2
31-
- uses: actions/setup-python@v3
31+
- uses: actions/setup-python@v4
32+
with:
33+
python-version-file: 'swift/.python-version'
3234
- name: Build Swift extractor
3335
run: |
3436
bazel run //swift:create-extractor-pack

.github/workflows/swift-qltest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jobs:
3333
- uses: actions/checkout@v3
3434
- uses: ./.github/actions/fetch-codeql
3535
- uses: bazelbuild/setup-bazelisk@v2
36+
- uses: actions/setup-python@v4
37+
with:
38+
python-version-file: 'swift/.python-version'
3639
- name: Build Swift extractor
3740
run: |
3841
bazel run //swift:create-extractor-pack

CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
/java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll @github/codeql-java @github/codeql-go
2121

2222
# CodeQL tools and associated docs
23-
/docs/codeql-cli/ @github/codeql-cli-reviewers
24-
/docs/codeql-for-visual-studio-code/ @github/codeql-vscode-reviewers
25-
/docs/ql-language-reference/ @github/codeql-frontend-reviewers
23+
/docs/codeql/codeql-cli/ @github/codeql-cli-reviewers
24+
/docs/codeql/codeql-for-visual-studio-code/ @github/codeql-vscode-reviewers
25+
/docs/codeql/ql-language-reference/ @github/codeql-frontend-reviewers
2626
/docs/query-*-style-guide.md @github/codeql-analysis-reviewers
2727

2828
# QL for QL reviewers

cpp/ql/lib/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.4.2
2+
3+
No user-facing changes.
4+
15
## 0.4.1
26

37
No user-facing changes.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.4.2
2+
3+
No user-facing changes.

cpp/ql/lib/codeql-pack.release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
lastReleaseVersion: 0.4.1
2+
lastReleaseVersion: 0.4.2

cpp/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/cpp-all
2-
version: 0.4.2-dev
2+
version: 0.4.2
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

cpp/ql/src/Best Practices/Unused Entities/UnusedStaticFunctions.ql

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,32 @@
1313

1414
import cpp
1515

16+
pragma[noinline]
17+
predicate possiblyIncompleteFile(File f) {
18+
exists(Diagnostic d | d.getFile() = f and d.getSeverity() >= 3)
19+
}
20+
1621
predicate immediatelyReachableFunction(Function f) {
17-
not f.isStatic() or
18-
exists(BlockExpr be | be.getFunction() = f) or
19-
f instanceof MemberFunction or
20-
f instanceof TemplateFunction or
21-
f.getFile() instanceof HeaderFile or
22-
f.getAnAttribute().hasName("constructor") or
23-
f.getAnAttribute().hasName("destructor") or
24-
f.getAnAttribute().hasName("used") or
22+
not f.isStatic()
23+
or
24+
exists(BlockExpr be | be.getFunction() = f)
25+
or
26+
f instanceof MemberFunction
27+
or
28+
f instanceof TemplateFunction
29+
or
30+
f.getFile() instanceof HeaderFile
31+
or
32+
f.getAnAttribute().hasName("constructor")
33+
or
34+
f.getAnAttribute().hasName("destructor")
35+
or
36+
f.getAnAttribute().hasName("used")
37+
or
2538
f.getAnAttribute().hasName("unused")
39+
or
40+
// a compiler error in the same file suggests we may be missing data
41+
possiblyIncompleteFile(f.getFile())
2642
}
2743

2844
predicate immediatelyReachableVariable(Variable v) {

0 commit comments

Comments
 (0)