Skip to content

Commit 622cd05

Browse files
authored
Merge branch 'main' into java/update-mad-decls-after-triage-2023-06-08T08-51-47
2 parents 7cbc13d + 5259a6e commit 622cd05

File tree

1,184 files changed

+45922
-21064
lines changed

Some content is hidden

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

1,184 files changed

+45922
-21064
lines changed

.bazelrc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
build --repo_env=CC=clang --repo_env=CXX=clang++ --cxxopt="-std=c++17"
1+
common --enable_platform_specific_config
2+
3+
build --repo_env=CC=clang --repo_env=CXX=clang++
4+
5+
build:linux --cxxopt=-std=c++20
6+
build:macos --cxxopt=-std=c++20 --cpu=darwin_x86_64
7+
build:windows --cxxopt=/std:c++20 --cxxopt=/Zc:preprocessor
28

39
try-import %workspace%/local.bazelrc

.github/workflows/csv-coverage-pr-artifacts.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- "*/ql/src/**/*.qll"
1111
- "*/ql/lib/**/*.ql"
1212
- "*/ql/lib/**/*.qll"
13+
- "*/ql/lib/ext/**/*.yml"
1314
- "misc/scripts/library-coverage/*.py"
1415
# input data files
1516
- "*/documentation/library-coverage/cwe-sink.csv"

config/identical-files.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,10 @@
523523
"python/ql/lib/semmle/python/dataflow/new/internal/TypeTracker.qll",
524524
"ruby/ql/lib/codeql/ruby/typetracking/TypeTracker.qll"
525525
],
526+
"SummaryTypeTracker": [
527+
"python/ql/lib/semmle/python/dataflow/new/internal/SummaryTypeTracker.qll",
528+
"ruby/ql/lib/codeql/ruby/typetracking/internal/SummaryTypeTracker.qll"
529+
],
526530
"AccessPathSyntax": [
527531
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/AccessPathSyntax.qll",
528532
"go/ql/lib/semmle/go/dataflow/internal/AccessPathSyntax.qll",
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `hasCopyConstructor` predicate from the `Class` class in `Class.qll`.
5+
* Deleted many deprecated predicates and classes with uppercase `AST`, `SSA`, `CFG`, `API`, etc. in their names. Use the PascalCased versions instead.
6+
* Deleted the deprecated `CodeDuplication.qll` file.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `getURL` predicate from the `Container`, `Folder`, and `File` classes. Use the `getLocation` predicate instead.

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -176,20 +176,6 @@ class Class extends UserType {
176176
/** Holds if this class, struct or union has a constructor. */
177177
predicate hasConstructor() { exists(this.getAConstructor()) }
178178

179-
/**
180-
* Holds if this class has a copy constructor that is either explicitly
181-
* declared (though possibly `= delete`) or is auto-generated, non-trivial
182-
* and called from somewhere.
183-
*
184-
* DEPRECATED: There is more than one reasonable definition of what it means
185-
* to have a copy constructor, and we do not want to promote one particular
186-
* definition by naming it with this predicate. Having a copy constructor
187-
* could mean that such a member is declared or defined in the source or that
188-
* it is callable by a particular caller. For C++11, there's also a question
189-
* of whether to include members that are defaulted or deleted.
190-
*/
191-
deprecated predicate hasCopyConstructor() { this.getAMemberFunction() instanceof CopyConstructor }
192-
193179
/**
194180
* Like accessOfBaseMember but returns multiple results if there are multiple
195181
* paths to `base` through the inheritance graph.

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ class Container extends Locatable, @container {
3434
*/
3535
string getAbsolutePath() { none() } // overridden by subclasses
3636

37-
/**
38-
* DEPRECATED: Use `getLocation` instead.
39-
* Gets a URL representing the location of this container.
40-
*
41-
* For more information see [Providing URLs](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/#providing-urls).
42-
*/
43-
deprecated string getURL() { none() } // overridden by subclasses
44-
4537
/**
4638
* Gets the relative path of this file or folder from the root folder of the
4739
* analyzed source location. The relative path of the root folder itself is
@@ -183,12 +175,6 @@ class Folder extends Container, @folder {
183175
}
184176

185177
override string getAPrimaryQlClass() { result = "Folder" }
186-
187-
/**
188-
* DEPRECATED: Use `getLocation` instead.
189-
* Gets the URL of this folder.
190-
*/
191-
deprecated override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
192178
}
193179

194180
/**
@@ -213,12 +199,6 @@ class File extends Container, @file {
213199
result.hasLocationInfo(_, 0, 0, 0, 0)
214200
}
215201

216-
/**
217-
* DEPRECATED: Use `getLocation` instead.
218-
* Gets the URL of this file.
219-
*/
220-
deprecated override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
221-
222202
/** Holds if this file was compiled as C (at any point). */
223203
predicate compiledAsC() { fileannotations(underlyingElement(this), 1, "compiled as c", "1") }
224204

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ class PrintAstConfiguration extends TPrintAstConfiguration {
2727
predicate shouldPrintFunction(Function func) { any() }
2828
}
2929

30-
/** DEPRECATED: Alias for PrintAstConfiguration */
31-
deprecated class PrintASTConfiguration = PrintAstConfiguration;
32-
3330
private predicate shouldPrintFunction(Function func) {
3431
exists(PrintAstConfiguration config | config.shouldPrintFunction(func))
3532
}
@@ -239,9 +236,6 @@ class PrintAstNode extends TPrintAstNode {
239236
}
240237
}
241238

242-
/** DEPRECATED: Alias for PrintAstNode */
243-
deprecated class PrintASTNode = PrintAstNode;
244-
245239
/**
246240
* Class that restricts the elements that we compute `qlClass` for.
247241
*/
@@ -286,19 +280,13 @@ abstract class BaseAstNode extends PrintAstNode {
286280
deprecated Locatable getAST() { result = this.getAst() }
287281
}
288282

289-
/** DEPRECATED: Alias for BaseAstNode */
290-
deprecated class BaseASTNode = BaseAstNode;
291-
292283
/**
293284
* A node representing an AST node other than a `DeclarationEntry`.
294285
*/
295286
abstract class AstNode extends BaseAstNode, TAstNode {
296287
AstNode() { this = TAstNode(ast) }
297288
}
298289

299-
/** DEPRECATED: Alias for AstNode */
300-
deprecated class ASTNode = AstNode;
301-
302290
/**
303291
* A node representing an `Expr`.
304292
*/

cpp/ql/lib/semmle/code/cpp/controlflow/SSA.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ library class StandardSsa extends SsaHelper {
1414
StandardSsa() { this = 0 }
1515
}
1616

17-
/** DEPRECATED: Alias for StandardSsa */
18-
deprecated class StandardSSA = StandardSsa;
19-
2017
/**
2118
* A definition of one or more SSA variables, including phi node definitions.
2219
* An _SSA variable_, as defined in the literature, is effectively the pair of

cpp/ql/lib/semmle/code/cpp/controlflow/SSAUtils.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,3 @@ library class SsaHelper extends int {
312312
ssa_use(v, result, _, _)
313313
}
314314
}
315-
316-
/** DEPRECATED: Alias for SsaHelper */
317-
deprecated class SSAHelper = SsaHelper;

0 commit comments

Comments
 (0)