Skip to content

Commit 3678e51

Browse files
redsun82redsun82
committed
Merge branch 'main' into redsun82/kotlin
2 parents c5f6c65 + dc4cc74 commit 3678e51

File tree

451 files changed

+1327
-230306
lines changed

Some content is hidden

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

451 files changed

+1327
-230306
lines changed

‎.gitattributes‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@
6868
# for those testing dbscheme files.
6969
/*/ql/lib/upgrades/initial/*.dbscheme -text
7070

71-
# Generated test files - these are synced from the standard JavaScript libraries using
72-
# `javascript/ql/experimental/adaptivethreatmodeling/test/update_endpoint_test_files.py`.
73-
/javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.js linguist-generated=true -merge
74-
/javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.ts linguist-generated=true -merge
75-
7671
# Auto-generated modeling for Python
7772
/python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml linguist-generated=true
7873

‎.github/labeler.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Java:
1515
- change-notes/**/*java.*
1616

1717
JS:
18-
- any: [ 'javascript/**/*', '!javascript/ql/experimental/adaptivethreatmodeling/**/*' ]
18+
- any: [ 'javascript/**/*' ]
1919
- change-notes/**/*javascript*
2020

2121
Kotlin:
@@ -46,6 +46,3 @@ documentation:
4646
# Since these are all shared files that need to be synced, just pick _one_ copy of each.
4747
"DataFlow Library":
4848
- "shared/dataflow/**/*"
49-
50-
"ATM":
51-
- javascript/ql/experimental/adaptivethreatmodeling/**/*

‎CODEOWNERS‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
/java/ql/test-kotlin1/ @github/codeql-kotlin
1313
/java/ql/test-kotlin2/ @github/codeql-kotlin
1414

15-
# ML-powered queries
16-
/javascript/ql/experimental/adaptivethreatmodeling/ @github/codeql-ml-powered-queries-reviewers
17-
1815
# CodeQL tools and associated docs
1916
/docs/codeql/codeql-cli/ @github/codeql-cli-reviewers
2017
/docs/codeql/codeql-for-visual-studio-code/ @github/codeql-vscode-reviewers
@@ -37,9 +34,7 @@ MODULE.bazel @github/codeql-ci-reviewers
3734

3835
# Workflows
3936
/.github/workflows/ @github/codeql-ci-reviewers
40-
/.github/workflows/atm-* @github/codeql-ml-powered-queries-reviewers
4137
/.github/workflows/go-* @github/codeql-go
42-
/.github/workflows/js-ml-tests.yml @github/codeql-ml-powered-queries-reviewers
4338
/.github/workflows/ql-for-ql-* @github/codeql-ql-for-ql-reviewers
4439
/.github/workflows/ruby-* @github/codeql-ruby
4540
/.github/workflows/swift.yml @github/codeql-swift

‎codeql-workspace.yml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ provide:
1111
- "cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml"
1212
- "go/ql/config/legacy-support/qlpack.yml"
1313
- "go/build/codeql-extractor-go/codeql-extractor.yml"
14-
- "javascript/ql/experimental/adaptivethreatmodeling/lib/qlpack.yml"
15-
# This pack is explicitly excluded from the workspace since most users
16-
# will want to use a version of this pack from the package cache. Internal
17-
# users can uncomment the following line and place a custom ML model
18-
# in the corresponding pack to test a custom ML model within their local
19-
# checkout.
20-
# - "javascript/ql/experimental/adaptivethreatmodeling/model/qlpack.yml"
21-
- "javascript/ql/experimental/adaptivethreatmodeling/modelbuilding/qlpack.yml"
22-
- "javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml"
23-
- "javascript/ql/experimental/adaptivethreatmodeling/test/qlpack.yml"
2414
- "csharp/ql/campaigns/Solorigate/lib/qlpack.yml"
2515
- "csharp/ql/campaigns/Solorigate/src/qlpack.yml"
2616
- "csharp/ql/campaigns/Solorigate/test/qlpack.yml"

‎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.12.11
2+
3+
No user-facing changes.
4+
15
## 0.12.10
26

37
### New Features

‎cpp/ql/lib/change-notes/released/0.12.11.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 0.12.11
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.12.10
2+
lastReleaseVersion: 0.12.11

‎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.12.11-dev
2+
version: 0.12.12-dev
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ module CppDataFlow implements InputSig<Location> {
2727
predicate mayBenefitFromCallContext = Private::mayBenefitFromCallContext/1;
2828

2929
predicate viableImplInCallContext = Private::viableImplInCallContext/2;
30+
31+
predicate neverSkipInPathGraph = Private::neverSkipInPathGraph/1;
3032
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,13 @@ predicate nodeIsHidden(Node n) {
13061306
n instanceof InitialGlobalValue
13071307
}
13081308

1309+
predicate neverSkipInPathGraph(Node n) {
1310+
// Always show the right-hand side of assignments in the path graph
1311+
exists(n.asDefinition())
1312+
or
1313+
exists(n.asIndirectDefinition())
1314+
}
1315+
13091316
class LambdaCallKind = Unit;
13101317

13111318
/** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */

0 commit comments

Comments
 (0)