Skip to content

Commit a4ef861

Browse files
erik-krogherik-krogh
committed
delete old deprecations
1 parent cee7088 commit a4ef861

File tree

19 files changed

+0
-495
lines changed

19 files changed

+0
-495
lines changed

‎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;

‎cpp/ql/lib/semmle/code/cpp/controlflow/internal/CFG.qll

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,9 +1385,6 @@ private module Cached {
13851385
conditionalSuccessor(n1, _, n2)
13861386
}
13871387

1388-
/** DEPRECATED: Alias for qlCfgSuccessor */
1389-
deprecated predicate qlCFGSuccessor = qlCfgSuccessor/2;
1390-
13911388
/**
13921389
* Holds if `n2` is a control-flow node such that the control-flow
13931390
* edge `(n1, n2)` may be taken when `n1` is an expression that is true.
@@ -1398,9 +1395,6 @@ private module Cached {
13981395
not conditionalSuccessor(n1, false, n2)
13991396
}
14001397

1401-
/** DEPRECATED: Alias for qlCfgTrueSuccessor */
1402-
deprecated predicate qlCFGTrueSuccessor = qlCfgTrueSuccessor/2;
1403-
14041398
/**
14051399
* Holds if `n2` is a control-flow node such that the control-flow
14061400
* edge `(n1, n2)` may be taken when `n1` is an expression that is false.
@@ -1410,7 +1404,4 @@ private module Cached {
14101404
conditionalSuccessor(n1, false, n2) and
14111405
not conditionalSuccessor(n1, true, n2)
14121406
}
1413-
1414-
/** DEPRECATED: Alias for qlCfgFalseSuccessor */
1415-
deprecated predicate qlCFGFalseSuccessor = qlCfgFalseSuccessor/2;
14161407
}

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/internal/AliasedSSA.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,6 @@ private Overlap getVariableMemoryLocationOverlap(
577577
*/
578578
predicate canReuseSsaForOldResult(Instruction instr) { OldSsa::canReuseSsaForMemoryResult(instr) }
579579

580-
/** DEPRECATED: Alias for canReuseSsaForOldResult */
581-
deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
582-
583580
bindingset[result, b]
584581
private boolean unbindBool(boolean b) { result != b.booleanNot() }
585582

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/internal/TOperand.qll

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,12 @@ private module Shared {
7474

7575
class TNonSsaMemoryOperand = Internal::TNonSsaMemoryOperand;
7676

77-
/** DEPRECATED: Alias for TNonSsaMemoryOperand */
78-
deprecated class TNonSSAMemoryOperand = TNonSsaMemoryOperand;
79-
8077
/**
8178
* Returns the non-Phi memory operand with the specified parameters.
8279
*/
8380
TNonSsaMemoryOperand nonSsaMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
8481
result = Internal::TNonSsaMemoryOperand(useInstr, tag)
8582
}
86-
87-
/** DEPRECATED: Alias for nonSsaMemoryOperand */
88-
deprecated TNonSSAMemoryOperand nonSSAMemoryOperand(TRawInstruction useInstr, MemoryOperandTag tag) {
89-
result = nonSsaMemoryOperand(useInstr, tag)
90-
}
9183
}
9284

9385
/**
@@ -167,9 +159,6 @@ module UnaliasedSsaOperands {
167159
TChiOperand chiOperand(Unaliased::Instruction useInstr, ChiOperandTag tag) { none() }
168160
}
169161

170-
/** DEPRECATED: Alias for UnaliasedSsaOperands */
171-
deprecated module UnaliasedSSAOperands = UnaliasedSsaOperands;
172-
173162
/**
174163
* Provides wrappers for the constructors of each branch of `TOperand` that is used by the
175164
* aliased SSA stage.
@@ -217,6 +206,3 @@ module AliasedSsaOperands {
217206
result = Internal::TAliasedChiOperand(useInstr, tag)
218207
}
219208
}
220-
221-
/** DEPRECATED: Alias for AliasedSsaOperands */
222-
deprecated module AliasedSSAOperands = AliasedSsaOperands;

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/IRConstruction.qll

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,11 +375,6 @@ Locatable getInstructionAst(TStageInstruction instr) {
375375
)
376376
}
377377

378-
/** DEPRECATED: Alias for getInstructionAst */
379-
deprecated Locatable getInstructionAST(TStageInstruction instr) {
380-
result = getInstructionAst(instr)
381-
}
382-
383378
CppType getInstructionResultType(TStageInstruction instr) {
384379
getInstructionTranslatedElement(instr).hasInstruction(_, getInstructionTag(instr), result)
385380
or

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ abstract class TranslatedExpr extends TranslatedElement {
7676

7777
final override Locatable getAst() { result = expr }
7878

79-
/** DEPRECATED: Alias for getAst */
80-
deprecated override Locatable getAST() { result = this.getAst() }
81-
8279
final override Declaration getFunction() { result = getEnclosingDeclaration(expr) }
8380

8481
/**

‎cpp/ql/lib/semmle/code/cpp/rangeanalysis/RangeSSA.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ library class RangeSsa extends SsaHelper {
4040
}
4141
}
4242

43-
/** DEPRECATED: Alias for RangeSsa */
44-
deprecated class RangeSSA = RangeSsa;
45-
4643
private predicate guard_defn(VariableAccess v, Expr guard, BasicBlock b, boolean branch) {
4744
guardCondition(guard, v, branch) and
4845
guardSuccessor(guard, branch, b)

‎cpp/ql/src/Security/CWE/CWE-020/ExternalAPIs.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class UntrustedExternalApiDataNode extends ExternalApiDataNode {
1616
DataFlow::Node getAnUntrustedSource() { UntrustedDataToExternalApiFlow::flow(result, this) }
1717
}
1818

19-
/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
20-
deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
21-
2219
/** An external API which is used with untrusted data. */
2320
private newtype TExternalApi =
2421
/** An untrusted API method `m` where untrusted data is passed at `index`. */
@@ -51,6 +48,3 @@ class ExternalApiUsedWithUntrustedData extends TExternalApi {
5148
)
5249
}
5350
}
54-
55-
/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
56-
deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;

‎cpp/ql/src/Security/CWE/CWE-020/ExternalAPIsSpecific.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ class ExternalApiDataNode extends DataFlow::Node {
4141
string getFunctionDescription() { result = this.getExternalFunction().toString() }
4242
}
4343

44-
/** DEPRECATED: Alias for ExternalApiDataNode */
45-
deprecated class ExternalAPIDataNode = ExternalApiDataNode;
46-
4744
/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
4845
deprecated class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
4946
UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
@@ -58,9 +55,6 @@ deprecated class UntrustedDataToExternalApiConfig extends TaintTracking::Configu
5855
override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
5956
}
6057

61-
/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
62-
deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
63-
6458
/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
6559
private module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
6660
predicate isSource(DataFlow::Node source) {

‎cpp/ql/src/Security/CWE/CWE-020/SafeExternalAPIFunction.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ private import semmle.code.cpp.models.interfaces.SideEffect
1010
*/
1111
abstract class SafeExternalApiFunction extends Function { }
1212

13-
/** DEPRECATED: Alias for SafeExternalApiFunction */
14-
deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
15-
1613
/** The default set of "safe" external APIs. */
1714
private class DefaultSafeExternalApiFunction extends SafeExternalApiFunction {
1815
DefaultSafeExternalApiFunction() {

‎cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIs.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ class UntrustedExternalApiDataNode extends ExternalApiDataNode {
1616
DataFlow::Node getAnUntrustedSource() { UntrustedDataToExternalApiFlow::flow(result, this) }
1717
}
1818

19-
/** DEPRECATED: Alias for UntrustedExternalApiDataNode */
20-
deprecated class UntrustedExternalAPIDataNode = UntrustedExternalApiDataNode;
21-
2219
/** An external API which is used with untrusted data. */
2320
private newtype TExternalApi =
2421
/** An untrusted API method `m` where untrusted data is passed at `index`. */
@@ -51,6 +48,3 @@ class ExternalApiUsedWithUntrustedData extends TExternalApi {
5148
)
5249
}
5350
}
54-
55-
/** DEPRECATED: Alias for ExternalApiUsedWithUntrustedData */
56-
deprecated class ExternalAPIUsedWithUntrustedData = ExternalApiUsedWithUntrustedData;

‎cpp/ql/src/Security/CWE/CWE-020/ir/ExternalAPIsSpecific.qll

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ class ExternalApiDataNode extends DataFlow::Node {
4141
string getFunctionDescription() { result = this.getExternalFunction().toString() }
4242
}
4343

44-
/** DEPRECATED: Alias for ExternalApiDataNode */
45-
deprecated class ExternalAPIDataNode = ExternalApiDataNode;
46-
4744
/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
4845
deprecated class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
4946
UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfigIR" }
@@ -53,9 +50,6 @@ deprecated class UntrustedDataToExternalApiConfig extends TaintTracking::Configu
5350
override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
5451
}
5552

56-
/** DEPRECATED: Alias for UntrustedDataToExternalApiConfig */
57-
deprecated class UntrustedDataToExternalAPIConfig = UntrustedDataToExternalApiConfig;
58-
5953
/** A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s. */
6054
private module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
6155
predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }

‎cpp/ql/src/Security/CWE/CWE-020/ir/SafeExternalAPIFunction.qll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ private import semmle.code.cpp.models.interfaces.SideEffect
1010
*/
1111
abstract class SafeExternalApiFunction extends Function { }
1212

13-
/** DEPRECATED: Alias for SafeExternalApiFunction */
14-
deprecated class SafeExternalAPIFunction = SafeExternalApiFunction;
15-
1613
/** The default set of "safe" external APIs. */
1714
private class DefaultSafeExternalApiFunction extends SafeExternalApiFunction {
1815
DefaultSafeExternalApiFunction() {

0 commit comments

Comments
 (0)