Skip to content

Commit 2cc762b

Browse files
committed
Merge branch 'main' into redsun82/bzlmod
2 parents ec3cc63 + ea67646 commit 2cc762b

File tree

14 files changed

+1740
-806
lines changed

14 files changed

+1740
-806
lines changed

.github/workflows/go-tests-other-os.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- .github/actions/**
99
- codeql-workspace.yml
1010
env:
11-
GO_VERSION: '~1.21.0'
11+
GO_VERSION: '~1.22.0'
1212

1313
permissions:
1414
contents: read
@@ -22,6 +22,7 @@ jobs:
2222
uses: actions/setup-go@v5
2323
with:
2424
go-version: ${{ env.GO_VERSION }}
25+
cache: false
2526
id: go
2627

2728
- name: Check out code
@@ -58,6 +59,7 @@ jobs:
5859
uses: actions/setup-go@v5
5960
with:
6061
go-version: ${{ env.GO_VERSION }}
62+
cache: false
6163
id: go
6264

6365
- name: Check out code

.github/workflows/go-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
- codeql-workspace.yml
1818

1919
env:
20-
GO_VERSION: '~1.21.0'
20+
GO_VERSION: '~1.22.0'
2121

2222
permissions:
2323
contents: read
@@ -32,6 +32,7 @@ jobs:
3232
uses: actions/setup-go@v5
3333
with:
3434
go-version: ${{ env.GO_VERSION }}
35+
cache: false
3536
id: go
3637

3738
- name: Check out code

cpp/ql/test/library-tests/ir/ir/PrintAST.expected

Lines changed: 489 additions & 221 deletions
Large diffs are not rendered by default.

cpp/ql/test/library-tests/ir/ir/aliased_ir.expected

Lines changed: 437 additions & 212 deletions
Large diffs are not rendered by default.

cpp/ql/test/library-tests/ir/ir/ir.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2129,6 +2129,7 @@ class ClassWithDestructor {
21292129
~ClassWithDestructor() { delete x; }
21302130

21312131
void set_x(char y) { *x = y; }
2132+
char get_x() { return *x; }
21322133
};
21332134

21342135
constexpr bool initialization_with_destructor_bool = true;
@@ -2152,6 +2153,17 @@ void initialization_with_destructor(bool b, char c) {
21522153
ClassWithDestructor x;
21532154
for(vector<ClassWithDestructor> ys(x); ClassWithDestructor y : ys)
21542155
y.set_x('a');
2156+
2157+
for(vector<ClassWithDestructor> ys(x); ClassWithDestructor y : ys) {
2158+
y.set_x('a');
2159+
if (y.get_x() == 'b')
2160+
return;
2161+
}
2162+
2163+
for(vector<int> ys(1); int y : ys) {
2164+
if (y == 1)
2165+
return;
2166+
}
21552167
}
21562168

21572169
// semmle-extractor-options: -std=c++20 --clang

cpp/ql/test/library-tests/ir/ir/operand_locations.expected

Lines changed: 406 additions & 191 deletions
Large diffs are not rendered by default.

cpp/ql/test/library-tests/ir/ir/raw_ir.expected

Lines changed: 374 additions & 175 deletions
Large diffs are not rendered by default.

csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public interface IBuildActions
140140
/// <summary>
141141
/// Returns the file name and extension of the specified path string.
142142
/// </summary>
143-
[return: NotNullIfNotNull("path")]
143+
[return: NotNullIfNotNull(nameof(path))]
144144
string? GetFileName(string? path);
145145

146146
/// <summary>

csharp/extractor/Semmle.Extraction.CSharp/Entities/Constructor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private ConstructorDeclarationSyntax? Syntax
126126
}
127127
}
128128

129-
[return: NotNullIfNotNull("constructor")]
129+
[return: NotNullIfNotNull(nameof(constructor))]
130130
public static new Constructor? Create(Context cx, IMethodSymbol? constructor)
131131
{
132132
if (constructor is null)

csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ public static void AddExplicitInterfaceQualifierToId(Context cx, EscapingTextWri
232232
/// <param name="cx"></param>
233233
/// <param name="methodDecl"></param>
234234
/// <returns></returns>
235-
[return: NotNullIfNotNull("methodDecl")]
235+
[return: NotNullIfNotNull(nameof(methodDecl))]
236236
public static Method? Create(Context cx, IMethodSymbol? methodDecl)
237237
{
238238
if (methodDecl is null)

0 commit comments

Comments
 (0)