Skip to content

Commit db114bb

Browse files
RasmusWLRasmusWL
committed
Merge branch 'main' into call-graph-code
2 parents fdb33ff + 62158c5 commit db114bb

File tree

610 files changed

+48554
-11725
lines changed

Some content is hidden

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

610 files changed

+48554
-11725
lines changed

‎.github/dependabot.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
version: 2
22
updates:
33
- package-ecosystem: "cargo"
4-
directory: "ruby/node-types"
5-
schedule:
6-
interval: "daily"
7-
- package-ecosystem: "cargo"
8-
directory: "ruby/generator"
9-
schedule:
10-
interval: "daily"
11-
- package-ecosystem: "cargo"
12-
directory: "ruby/extractor"
4+
directory: "ruby"
135
schedule:
146
interval: "daily"
7+
158
- package-ecosystem: "cargo"
16-
directory: "ruby/autobuilder"
9+
directory: "ql"
1710
schedule:
1811
interval: "daily"
1912

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup dotnet
3131
uses: actions/setup-dotnet@v2
3232
with:
33-
dotnet-version: 6.0.202
33+
dotnet-version: 7.0.102
3434

3535
- name: Checkout repository
3636
uses: actions/checkout@v3

‎.github/workflows/csharp-qltest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ jobs:
7777
- name: Setup dotnet
7878
uses: actions/setup-dotnet@v3
7979
with:
80-
dotnet-version: 6.0.202
80+
dotnet-version: 7.0.102
8181
- name: Extractor unit tests
8282
run: |
83-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/csharp/extractor/Semmle.Util.Tests"
84-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/csharp/extractor/Semmle.Extraction.Tests"
85-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests"
86-
dotnet test -p:RuntimeFrameworkVersion=6.0.4 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"
83+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/extractor/Semmle.Util.Tests"
84+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/extractor/Semmle.Extraction.Tests"
85+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests"
86+
dotnet test -p:RuntimeFrameworkVersion=7.0.2 "${{ github.workspace }}/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests"

‎.github/workflows/ql-for-ql-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: ./.github/actions/find-latest-bundle
2828
- name: Find codeql
2929
id: find-codeql
30-
uses: github/codeql-action/init@45955cb1830b640e2c1603ad72ad542a49d47b96
30+
uses: github/codeql-action/init@beae46e6b1da530ed5e9fc6a756f92433ca47ae1
3131
with:
3232
languages: javascript # does not matter
3333
tools: ${{ steps.find-latest-bundle.outputs.url }}
@@ -139,7 +139,7 @@ jobs:
139139
env:
140140
CONF: ./ql-for-ql-config.yml
141141
- name: Initialize CodeQL
142-
uses: github/codeql-action/init@45955cb1830b640e2c1603ad72ad542a49d47b96
142+
uses: github/codeql-action/init@beae46e6b1da530ed5e9fc6a756f92433ca47ae1
143143
with:
144144
languages: ql
145145
db-location: ${{ runner.temp }}/db
@@ -152,7 +152,7 @@ jobs:
152152
PACK: ${{ runner.temp }}/pack
153153

154154
- name: Perform CodeQL Analysis
155-
uses: github/codeql-action/analyze@45955cb1830b640e2c1603ad72ad542a49d47b96
155+
uses: github/codeql-action/analyze@beae46e6b1da530ed5e9fc6a756f92433ca47ae1
156156
with:
157157
category: "ql-for-ql"
158158
- name: Copy sarif file to CWD

‎.github/workflows/ql-for-ql-dataset_measure.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Find codeql
2727
id: find-codeql
28-
uses: github/codeql-action/init@45955cb1830b640e2c1603ad72ad542a49d47b96
28+
uses: github/codeql-action/init@beae46e6b1da530ed5e9fc6a756f92433ca47ae1
2929
with:
3030
languages: javascript # does not matter
3131
- uses: ./.github/actions/os-version

‎.github/workflows/ql-for-ql-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
paths:
77
- "ql/**"
88
- codeql-workspace.yml
9+
- .github/workflows/ql-for-ql-tests.yml
910
pull_request:
1011
branches: [main]
1112
paths:
1213
- "ql/**"
1314
- codeql-workspace.yml
15+
- .github/workflows/ql-for-ql-tests.yml
1416

1517
env:
1618
CARGO_TERM_COLOR: always
@@ -22,7 +24,7 @@ jobs:
2224
- uses: actions/checkout@v3
2325
- name: Find codeql
2426
id: find-codeql
25-
uses: github/codeql-action/init@45955cb1830b640e2c1603ad72ad542a49d47b96
27+
uses: github/codeql-action/init@beae46e6b1da530ed5e9fc6a756f92433ca47ae1
2628
with:
2729
languages: javascript # does not matter
2830
- uses: ./.github/actions/os-version
@@ -65,7 +67,7 @@ jobs:
6567
echo "/usr/local/opt/gnu-tar/libexec/gnubin" >> $GITHUB_PATH
6668
- name: Find codeql
6769
id: find-codeql
68-
uses: github/codeql-action/init@77a8d2d10c0b403a8b4aadbd223dc489ecd22683
70+
uses: github/codeql-action/init@beae46e6b1da530ed5e9fc6a756f92433ca47ae1
6971
with:
7072
languages: javascript # does not matter
7173
- uses: ./.github/actions/os-version

‎config/identical-files.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
3535
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
3636
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
37+
"python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplForRegExp.qll",
3738
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll",
3839
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
39-
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForRegExp.qll",
4040
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll",
4141
"ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll",
4242
"swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll"

‎cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/Semmle.Autobuild.Cpp.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net7.0</TargetFramework>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
77
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
88
<Nullable>enable</Nullable>

‎cpp/autobuilder/Semmle.Autobuild.Cpp/Semmle.Autobuild.Cpp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>Semmle.Autobuild.Cpp</AssemblyName>
66
<RootNamespace>Semmle.Autobuild.Cpp</RootNamespace>
77
<ApplicationIcon />

‎cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1487,14 +1487,18 @@ private module MkStage<StageSig PrevStage> {
14871487
PrevStage::readStepCand(node1, _, _, config)
14881488
}
14891489

1490+
bindingset[ap, c]
1491+
pragma[inline_late]
1492+
private predicate hasHeadContent(Ap ap, Content c) { getHeadContent(ap) = c }
1493+
14901494
pragma[nomagic]
14911495
private predicate fwdFlowRead(
14921496
Ap ap, Content c, NodeEx node1, NodeEx node2, FlowState state, Cc cc,
14931497
ParamNodeOption summaryCtx, ApOption argAp, Configuration config
14941498
) {
14951499
fwdFlowRead0(node1, state, cc, summaryCtx, argAp, ap, config) and
14961500
PrevStage::readStepCand(node1, c, node2, config) and
1497-
getHeadContent(ap) = c
1501+
hasHeadContent(ap, c)
14981502
}
14991503

15001504
pragma[nomagic]

0 commit comments

Comments
 (0)