Skip to content

Commit 9988c19

Browse files
authored
Merge branch 'main' into tutorial/library-pack
2 parents d2ee8c0 + c513867 commit 9988c19

File tree

406 files changed

+26650
-5374
lines changed

Some content is hidden

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

406 files changed

+26650
-5374
lines changed

.github/actions/cache-query-compilation/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@ runs:
2323
run: |
2424
MERGE_BASE=$(git cat-file commit $GITHUB_SHA | grep '^parent ' | head -1 | cut -f 2 -d " ")
2525
echo "merge_base=$MERGE_BASE" >> $GITHUB_ENV
26-
- name: Restore read-only cache (PR)
26+
- name: Restore cache (PR)
2727
if: ${{ github.event_name == 'pull_request' }}
28-
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
28+
uses: actions/cache/restore@v3
2929
with:
3030
path: '**/.cache'
31-
read-only: true
3231
key: codeql-compile-${{ inputs.key }}-pr-${{ github.sha }}
3332
restore-keys: |
3433
codeql-compile-${{ inputs.key }}-${{ github.base_ref }}-${{ env.merge_base }}
3534
codeql-compile-${{ inputs.key }}-${{ github.base_ref }}-
3635
codeql-compile-${{ inputs.key }}-main-
37-
- name: Fill cache (push)
36+
- name: Fill cache (only branch push)
3837
if: ${{ github.event_name != 'pull_request' }}
39-
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
38+
uses: actions/cache@v3
4039
with:
4140
path: '**/.cache'
4241
key: codeql-compile-${{ inputs.key }}-${{ github.ref_name }}-${{ github.sha }} # just fill on main

.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/stale@v6
15+
- uses: actions/stale@v7
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
stale-issue-message: 'This issue is stale because it has been open 14 days with no activity. Comment or remove the `Stale` label in order to avoid having this issue closed in 7 days.'
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* The `ArgvSource` flow source now uses the second parameter of `main` as its source instead of the uses of this parameter.

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/InstructionTag.qll

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,19 @@ newtype TInstructionTag =
7272
AsmInputTag(int elementIndex) { exists(AsmStmt asm | exists(asm.getChild(elementIndex))) } or
7373
ThisAddressTag() or
7474
ThisLoadTag() or
75-
StructuredBindingAccessTag()
75+
StructuredBindingAccessTag() or
76+
// The next three cases handle generation of the constants -1, 0 and 1 for __except handling.
77+
TryExceptGenerateNegativeOne() or
78+
TryExceptGenerateZero() or
79+
TryExceptGenerateOne() or
80+
// The next three cases handle generation of comparisons for __except handling.
81+
TryExceptCompareNegativeOne() or
82+
TryExceptCompareZero() or
83+
TryExceptCompareOne() or
84+
// The next three cases handle generation of branching for __except handling.
85+
TryExceptCompareNegativeOneBranch() or
86+
TryExceptCompareZeroBranch() or
87+
TryExceptCompareOneBranch()
7688

7789
class InstructionTag extends TInstructionTag {
7890
final string toString() { result = "Tag" }
@@ -224,4 +236,22 @@ string getInstructionTagId(TInstructionTag tag) {
224236
tag = ThisLoadTag() and result = "ThisLoad"
225237
or
226238
tag = StructuredBindingAccessTag() and result = "StructuredBindingAccess"
239+
or
240+
tag = TryExceptCompareNegativeOne() and result = "TryExceptCompareNegativeOne"
241+
or
242+
tag = TryExceptCompareZero() and result = "TryExceptCompareZero"
243+
or
244+
tag = TryExceptCompareOne() and result = "TryExceptCompareOne"
245+
or
246+
tag = TryExceptGenerateNegativeOne() and result = "TryExceptGenerateNegativeOne"
247+
or
248+
tag = TryExceptGenerateZero() and result = "TryExceptGenerateNegativeOne"
249+
or
250+
tag = TryExceptGenerateOne() and result = "TryExceptGenerateOne"
251+
or
252+
tag = TryExceptCompareNegativeOneBranch() and result = "TryExceptCompareNegativeOneBranch"
253+
or
254+
tag = TryExceptCompareZeroBranch() and result = "TryExceptCompareZeroBranch"
255+
or
256+
tag = TryExceptCompareOneBranch() and result = "TryExceptCompareOneBranch"
227257
}

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedElement.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ newtype TTranslatedElement =
675675
} or
676676
// A statement
677677
TTranslatedStmt(Stmt stmt) { translateStmt(stmt) } or
678+
TTranslatedMicrosoftTryExceptHandler(MicrosoftTryExceptStmt stmt) or
678679
// A function
679680
TTranslatedFunction(Function func) { translateFunction(func) } or
680681
// A constructor init list

0 commit comments

Comments
 (0)