Skip to content

Commit e2e91ac

Browse files
committed
Merge branch 'main' into js/shared-dataflow-merge-main
2 parents 72daa98 + 5a4cd1c commit e2e91ac

File tree

2,619 files changed

+75767
-45387
lines changed

Some content is hidden

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

2,619 files changed

+75767
-45387
lines changed

.github/workflows/go-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
paths:
55
- "go/**"
6+
- "shared/**"
67
- .github/workflows/go-tests.yml
78
- .github/actions/**
89
- codeql-workspace.yml
@@ -12,6 +13,7 @@ on:
1213
pull_request:
1314
paths:
1415
- "go/**"
16+
- "shared/**"
1517
- .github/workflows/go-tests.yml
1618
- .github/actions/**
1719
- codeql-workspace.yml

Cargo.lock

Lines changed: 48 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ members = [
77
"ruby/extractor",
88
"rust/extractor",
99
"rust/extractor/macros",
10+
"rust/generate-schema",
1011
]
1112

1213
[patch.crates-io]

MODULE.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ r.from_cargo(
6161
"//ruby/extractor:Cargo.toml",
6262
"//rust/extractor:Cargo.toml",
6363
"//rust/extractor/macros:Cargo.toml",
64+
"//rust/generate-schema:Cargo.toml",
6465
"//shared/tree-sitter-extractor:Cargo.toml",
6566
],
6667
)
@@ -127,6 +128,7 @@ use_repo(
127128
"kotlin-compiler-1.9.20-Beta",
128129
"kotlin-compiler-2.0.0-RC1",
129130
"kotlin-compiler-2.0.20-Beta2",
131+
"kotlin-compiler-2.1.0-Beta1",
130132
"kotlin-compiler-embeddable-1.5.0",
131133
"kotlin-compiler-embeddable-1.5.10",
132134
"kotlin-compiler-embeddable-1.5.20",
@@ -140,6 +142,7 @@ use_repo(
140142
"kotlin-compiler-embeddable-1.9.20-Beta",
141143
"kotlin-compiler-embeddable-2.0.0-RC1",
142144
"kotlin-compiler-embeddable-2.0.20-Beta2",
145+
"kotlin-compiler-embeddable-2.1.0-Beta1",
143146
"kotlin-stdlib-1.5.0",
144147
"kotlin-stdlib-1.5.10",
145148
"kotlin-stdlib-1.5.20",
@@ -153,6 +156,7 @@ use_repo(
153156
"kotlin-stdlib-1.9.20-Beta",
154157
"kotlin-stdlib-2.0.0-RC1",
155158
"kotlin-stdlib-2.0.20-Beta2",
159+
"kotlin-stdlib-2.1.0-Beta1",
156160
)
157161

158162
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk")

config/identical-files.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@
5757
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
5858
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
5959
],
60-
"Model as Data Generation Java/C# - CaptureModels": [
61-
"java/ql/src/utils/modelgenerator/internal/CaptureModels.qll",
62-
"csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll"
63-
],
6460
"Sign Java/C#": [
6561
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
6662
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
@@ -355,5 +351,9 @@
355351
"Python model summaries test extension": [
356352
"python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.ext.yml",
357353
"python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.ext.yml"
354+
],
355+
"Diagnostics.qll": [
356+
"ruby/ql/lib/codeql/ruby/Diagnostics.qll",
357+
"rust/ql/lib/codeql/rust/Diagnostics.qll"
358358
]
359359
}

cpp/ql/lib/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.1
2+
3+
No user-facing changes.
4+
15
## 2.0.0
26

37
### Breaking Changes
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## 2.0.1
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: 2.0.0
2+
lastReleaseVersion: 2.0.1

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

cpp/ql/lib/semmle/code/cpp/Function.qll

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,17 @@ class Function extends Declaration, ControlFlowNode, AccessHolder, @function {
500500
* Gets the nearest enclosing AccessHolder.
501501
*/
502502
override AccessHolder getEnclosingAccessHolder() { result = this.getDeclaringType() }
503+
504+
/**
505+
* Holds if this function has extraction errors that create an `ErrorExpr`.
506+
*/
507+
predicate hasErrors() {
508+
exists(ErrorExpr e |
509+
e.getEnclosingFunction() = this and
510+
// Exclude the first allocator call argument because it is always extracted as `ErrorExpr`.
511+
not exists(NewOrNewArrayExpr new | e = new.getAllocatorCall().getArgument(0))
512+
)
513+
}
503514
}
504515

505516
pragma[noinline]
@@ -651,7 +662,8 @@ class FunctionDeclarationEntry extends DeclarationEntry, @fun_decl {
651662

652663
/**
653664
* Holds if this declaration is an implicit function declaration, that is,
654-
* where a function is used before it is declared (under older C standards).
665+
* where a function is used before it is declared (under older C standards,
666+
* or when there were parse errors).
655667
*/
656668
predicate isImplicit() { fun_implicit(underlyingElement(this)) }
657669

0 commit comments

Comments
 (0)