Skip to content

Commit 58779e1

Browse files
authored
Merge branch 'main' into brodes/overflow-buffer-fixes-upstream
2 parents 1005a89 + 4c8aec0 commit 58779e1

File tree

122 files changed

+68435
-60201
lines changed

Some content is hidden

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

122 files changed

+68435
-60201
lines changed

.github/pull_request_template.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
### Pull Request checklist
2+
3+
#### All query authors
4+
5+
- [ ] A change note is added if necessary. See [the documentation](https://github.com/github/codeql/blob/main/docs/change-notes.md) in this repository.
6+
- [ ] All new queries have appropriate `.qhelp`. See [the documentation](https://github.com/github/codeql/blob/main/docs/query-help-style-guide.md) in this repository.
7+
- [ ] QL tests are added if necessary. See [Testing custom queries](https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/testing-custom-queries) in the GitHub documentation.
8+
- [ ] New and changed queries have correct query metadata. See [the documentation](https://github.com/github/codeql/blob/main/docs/query-metadata-style-guide.md) in this repository.
9+
10+
#### Internal query authors only
11+
12+
- [ ] Autofixes generated based on these changes are valid, only needed if this PR makes significant changes to `.ql`, `.qll`, or `.qhelp` files. See [the documentation](https://github.com/github/codeql-team/blob/main/docs/best-practices/validating-autofix-for-query-changes.md) (internal access required).
13+
- [ ] Changes are validated [at scale](https://github.com/github/codeql-dca/) (internal access required).

.github/workflows/csharp-qltest.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,6 @@ permissions:
2929
contents: read
3030

3131
jobs:
32-
qlupgrade:
33-
runs-on: ubuntu-latest
34-
steps:
35-
- uses: actions/checkout@v4
36-
- uses: ./.github/actions/fetch-codeql
37-
- name: Check DB upgrade scripts
38-
run: |
39-
echo >empty.trap
40-
codeql dataset import -S ql/lib/upgrades/initial/semmlecode.csharp.dbscheme testdb empty.trap
41-
codeql dataset upgrade testdb --additional-packs ql/lib
42-
diff -q testdb/semmlecode.csharp.dbscheme ql/lib/semmlecode.csharp.dbscheme
43-
- name: Check DB downgrade scripts
44-
run: |
45-
echo >empty.trap
46-
rm -rf testdb; codeql dataset import -S ql/lib/semmlecode.csharp.dbscheme testdb empty.trap
47-
codeql resolve upgrades --format=lines --allow-downgrades --additional-packs downgrades \
48-
--dbscheme=ql/lib/semmlecode.csharp.dbscheme --target-dbscheme=downgrades/initial/semmlecode.csharp.dbscheme |
49-
xargs codeql execute upgrades testdb
50-
diff -q testdb/semmlecode.csharp.dbscheme downgrades/initial/semmlecode.csharp.dbscheme
51-
qltest:
52-
if: github.repository_owner == 'github'
53-
runs-on: ubuntu-latest-xl
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
slice: ["1/2", "2/2"]
58-
steps:
59-
- uses: actions/checkout@v4
60-
- uses: ./csharp/actions/create-extractor-pack
61-
- name: Cache compilation cache
62-
id: query-cache
63-
uses: ./.github/actions/cache-query-compilation
64-
with:
65-
key: csharp-qltest-${{ matrix.slice }}
66-
- name: Run QL tests
67-
run: |
68-
codeql test run --threads=0 --ram 50000 --slice ${{ matrix.slice }} --search-path "${{ github.workspace }}" --check-databases --check-undefined-labels --check-repeated-labels --check-redefined-labels --consistency-queries ql/consistency-queries ql/test --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
69-
env:
70-
GITHUB_TOKEN: ${{ github.token }}
7132
unit-tests:
7233
strategy:
7334
matrix:

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ local_path_override(
1616

1717
bazel_dep(name = "platforms", version = "0.0.10")
1818
bazel_dep(name = "rules_go", version = "0.50.0")
19-
bazel_dep(name = "rules_pkg", version = "0.10.1")
19+
bazel_dep(name = "rules_pkg", version = "1.0.1")
2020
bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
21-
bazel_dep(name = "rules_python", version = "0.32.2")
21+
bazel_dep(name = "rules_python", version = "0.35.0")
2222
bazel_dep(name = "bazel_skylib", version = "1.6.1")
2323
bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
2424
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
@@ -27,7 +27,7 @@ bazel_dep(name = "rules_kotlin", version = "1.9.4-codeql.1")
2727
bazel_dep(name = "gazelle", version = "0.38.0")
2828
bazel_dep(name = "rules_dotnet", version = "0.15.1")
2929
bazel_dep(name = "googletest", version = "1.14.0.bcr.1")
30-
bazel_dep(name = "rules_rust", version = "0.49.1")
30+
bazel_dep(name = "rules_rust", version = "0.49.3")
3131

3232
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
3333

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
class Function extends @function {
2+
string toString() { none() }
3+
}
4+
5+
class Type extends @type {
6+
string toString() { none() }
7+
}
8+
9+
class Variable extends @variable {
10+
string toString() { none() }
11+
}
12+
13+
from Function func, Type traits, Variable handle, Variable promise
14+
where
15+
coroutine(func, traits) and
16+
coroutine_placeholder_variable(handle, 1, func) and
17+
coroutine_placeholder_variable(promise, 2, func)
18+
select func, traits, handle, promise

0 commit comments

Comments
 (0)