Skip to content

Commit 8b01dfe

Browse files
committed
Merge branch 'main' into mathiasvp/replace-ast-with-ir-use-usedataflow
2 parents 0f93e5c + 0ad585c commit 8b01dfe

841 files changed

Lines changed: 43527 additions & 26165 deletions

File tree

Some content is hidden

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

.github/workflows/check-change-note.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,9 @@ jobs:
2626
run: |
2727
gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq 'any(.[].filename ; test("/change-notes/.*[.]md$"))' |
2828
grep true -c
29+
- name: Fail if the change note filename doesn't match the expected format. The file name must be of the form 'YYYY-MM-DD.md' or 'YYYY-MM-DD-{title}.md', where '{title}' is arbitrary text.
30+
env:
31+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32+
run: |
33+
gh api 'repos/${{github.repository}}/pulls/${{github.event.number}}/files' --paginate --jq '[.[].filename | select(test("/change-notes/.*[.]md$"))] | all(test("/change-notes/[0-9]{4}-[0-9]{2}-[0-9]{2}.*[.]md$"))' |
34+
grep true -c

.github/workflows/ruby-build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,10 @@ jobs:
115115
- name: Build Query Pack
116116
run: |
117117
rm -rf target/packs
118-
codeql pack create ../shared/ssa --output target/packs
119118
codeql pack create ../misc/suite-helpers --output target/packs
120119
codeql pack create ../shared/regex --output target/packs
120+
codeql pack create ../shared/ssa --output target/packs
121+
codeql pack create ../shared/tutorial --output target/packs
121122
codeql pack create ql/lib --output target/packs
122123
codeql pack create -j0 ql/src --output target/packs --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}"
123124
PACK_FOLDER=$(readlink -f target/packs/codeql/ruby-queries/*)

config/identical-files.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -402,16 +402,6 @@
402402
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll",
403403
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll"
404404
],
405-
"Inline Test Expectations": [
406-
"cpp/ql/test/TestUtilities/InlineExpectationsTest.qll",
407-
"csharp/ql/test/TestUtilities/InlineExpectationsTest.qll",
408-
"java/ql/test/TestUtilities/InlineExpectationsTest.qll",
409-
"python/ql/test/TestUtilities/InlineExpectationsTest.qll",
410-
"ruby/ql/test/TestUtilities/InlineExpectationsTest.qll",
411-
"ql/ql/test/TestUtilities/InlineExpectationsTest.qll",
412-
"go/ql/test/TestUtilities/InlineExpectationsTest.qll",
413-
"swift/ql/test/TestUtilities/InlineExpectationsTest.qll"
414-
],
415405
"C++ ExternalAPIs": [
416406
"cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll",
417407
"cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll"
@@ -505,14 +495,6 @@
505495
"python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll",
506496
"ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll"
507497
],
508-
"CodeQL Tutorial": [
509-
"cpp/ql/lib/tutorial.qll",
510-
"csharp/ql/lib/tutorial.qll",
511-
"java/ql/lib/tutorial.qll",
512-
"javascript/ql/lib/tutorial.qll",
513-
"python/ql/lib/tutorial.qll",
514-
"ruby/ql/lib/tutorial.qll"
515-
],
516498
"AccessPathSyntax": [
517499
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/AccessPathSyntax.qll",
518500
"go/ql/lib/semmle/go/dataflow/internal/AccessPathSyntax.qll",

cpp/downgrades/23f7cbb88a4eb29f30c3490363dc201bc054c5ff/exprs.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ predicate isExprWithNewBuiltin(Expr expr) {
1313
from Expr expr, int kind, int kind_new, Location location
1414
where
1515
exprs(expr, kind, location) and
16-
if isExprWithNewBuiltin(expr) then kind_new = 0 else kind_new = kind
16+
if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
1717
select expr, kind_new, location

cpp/downgrades/73af5058c6899dcdb05754c27ca966aeb3a68c94/exprs.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ class Location extends @location_expr {
99
from Expr expr, int kind, int kind_new, Location location
1010
where
1111
exprs(expr, kind, location) and
12-
if expr instanceof @blockassignexpr then kind_new = 0 else kind_new = kind
12+
if expr instanceof @blockassignexpr then kind_new = 1 else kind_new = kind
1313
select expr, kind_new, location
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class BuiltinType extends @builtintype {
2+
string toString() { none() }
3+
}
4+
5+
from BuiltinType type, string name, int kind, int kind_new, int size, int sign, int alignment
6+
where
7+
builtintypes(type, name, kind, size, sign, alignment) and
8+
if type instanceof @float16 or type instanceof @complex_float16
9+
then kind_new = 2
10+
else kind_new = kind
11+
select type, name, kind_new, size, sign, alignment

0 commit comments

Comments
 (0)