Skip to content

Commit 060c37b

Browse files
authored
Merge pull request github#12345 from erik-krogh/delOldDeps
delete old deprecations
2 parents de84ddd + 6c1ebd9 commit 060c37b

File tree

41 files changed

+43
-550
lines changed

Some content is hidden

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

41 files changed

+43
-550
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `hasGeneratedCopyConstructor` and `hasGeneratedCopyAssignmentOperator` predicates from the `Folder` class.
5+
* Deleted the deprecated `getPath` and `getFolder` predicates from the `XmlFile` class.
6+
* Deleted the deprecated `getMustlockFunction`, `getTrylockFunction`, `getLockFunction`, and `getUnlockFunction` predicates from the `MutexType` class.
7+
* Deleted the deprecated `getPosInBasicBlock` predicate from the `SubBasicBlock` class.
8+
* Deleted the deprecated `getExpr` predicate from the `PointerDereferenceExpr` class.
9+
* Deleted the deprecated `getUseInstruction` and `getDefinitionInstruction` predicates from the `Operand` class.
10+
* Deleted the deprecated `isInParameter`, `isInParameterPointer`, and `isInQualifier` predicates from the `FunctionInput` class.
11+
* Deleted the deprecated `isOutParameterPointer`, `isOutQualifier`, `isOutReturnValue`, and `isOutReturnPointer` predicate from the `FunctionOutput` class.
12+
* Deleted the deprecated 3-argument `isGuardPhi` predicate from the `RangeSsaDefinition` class.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,18 +227,6 @@ class Class extends UserType {
227227
result = this.accessOfBaseMember(member.getDeclaringType(), member.getASpecifier())
228228
}
229229

230-
/**
231-
* DEPRECATED: name changed to `hasImplicitCopyConstructor` to reflect that
232-
* `= default` members are no longer included.
233-
*/
234-
deprecated predicate hasGeneratedCopyConstructor() { this.hasImplicitCopyConstructor() }
235-
236-
/**
237-
* DEPRECATED: name changed to `hasImplicitCopyAssignmentOperator` to
238-
* reflect that `= default` members are no longer included.
239-
*/
240-
deprecated predicate hasGeneratedCopyAssignmentOperator() { this.hasImplicitCopyConstructor() }
241-
242230
/**
243231
* Holds if this class, struct or union has an implicitly-declared copy
244232
* constructor that is not _deleted_. This predicate is more accurate than

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,6 @@ class XmlFile extends XmlParent, File {
108108
/** Gets the name of this XML file. */
109109
override string getName() { result = File.super.getAbsolutePath() }
110110

111-
/**
112-
* DEPRECATED: Use `getAbsolutePath()` instead.
113-
*
114-
* Gets the path of this XML file.
115-
*/
116-
deprecated string getPath() { result = this.getAbsolutePath() }
117-
118-
/**
119-
* DEPRECATED: Use `getParentContainer().getAbsolutePath()` instead.
120-
*
121-
* Gets the path of the folder that contains this XML file.
122-
*/
123-
deprecated string getFolder() { result = this.getParentContainer().getAbsolutePath() }
124-
125111
/** Gets the encoding of this XML file. */
126112
string getEncoding() { xmlEncoding(this, result) }
127113

cpp/ql/lib/semmle/code/cpp/commons/Synchronization.qll

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,6 @@ abstract class MutexType extends Type {
5959
* Gets a call that unlocks any mutex of this type.
6060
*/
6161
FunctionCall getUnlockAccess() { this.unlockAccess(result, _) }
62-
63-
/**
64-
* DEPRECATED: use mustlockAccess(fc, arg) instead.
65-
*/
66-
deprecated Function getMustlockFunction() { result = this.getMustlockAccess().getTarget() }
67-
68-
/**
69-
* DEPRECATED: use trylockAccess(fc, arg) instead.
70-
*/
71-
deprecated Function getTrylockFunction() { result = this.getTrylockAccess().getTarget() }
72-
73-
/**
74-
* DEPRECATED: use lockAccess(fc, arg) instead.
75-
*/
76-
deprecated Function getLockFunction() { result = this.getLockAccess().getTarget() }
77-
78-
/**
79-
* DEPRECATED: use unlockAccess(fc, arg) instead.
80-
*/
81-
deprecated Function getUnlockFunction() { result = this.getUnlockAccess().getTarget() }
8262
}
8363

8464
/**

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ class SubBasicBlock extends ControlFlowNodeBase {
7575
)
7676
}
7777

78-
/**
79-
* DEPRECATED: use `getRankInBasicBlock` instead. Note that this predicate
80-
* returns a 0-based position, while `getRankInBasicBlock` returns a 1-based
81-
* position.
82-
*/
83-
deprecated int getPosInBasicBlock(BasicBlock bb) { result = this.getRankInBasicBlock(bb) - 1 }
84-
8578
pragma[noinline]
8679
private int getIndexInBasicBlock(BasicBlock bb) { this = bb.getNode(result) }
8780

cpp/ql/lib/semmle/code/cpp/dataflow/internal/SubBasicBlocks.qll

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ class SubBasicBlock extends ControlFlowNodeBase {
7575
)
7676
}
7777

78-
/**
79-
* DEPRECATED: use `getRankInBasicBlock` instead. Note that this predicate
80-
* returns a 0-based position, while `getRankInBasicBlock` returns a 1-based
81-
* position.
82-
*/
83-
deprecated int getPosInBasicBlock(BasicBlock bb) { result = this.getRankInBasicBlock(bb) - 1 }
84-
8578
pragma[noinline]
8679
private int getIndexInBasicBlock(BasicBlock bb) { this = bb.getNode(result) }
8780

cpp/ql/lib/semmle/code/cpp/exprs/Expr.qll

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -719,13 +719,6 @@ class ReferenceToExpr extends Conversion, @reference_to {
719719
class PointerDereferenceExpr extends UnaryOperation, @indirect {
720720
override string getAPrimaryQlClass() { result = "PointerDereferenceExpr" }
721721

722-
/**
723-
* DEPRECATED: Use getOperand() instead.
724-
*
725-
* Gets the expression that is being dereferenced.
726-
*/
727-
deprecated Expr getExpr() { result = this.getOperand() }
728-
729722
override string getOperator() { result = "*" }
730723

731724
override int getPrecedence() { result = 16 }

cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/Operand.qll

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,6 @@ class Operand extends TStageOperand {
8787
this.getDefinitionOverlap() instanceof MustExactlyOverlap
8888
}
8989

90-
/**
91-
* DEPRECATED: renamed to `getUse`.
92-
*
93-
* Gets the `Instruction` that consumes this operand.
94-
*/
95-
deprecated final Instruction getUseInstruction() { result = this.getUse() }
96-
97-
/**
98-
* DEPRECATED: use `getAnyDef` or `getDef`. The exact replacement for this
99-
* predicate is `getAnyDef`, but most uses of this predicate should probably
100-
* be replaced with `getDef`.
101-
*
102-
* Gets the `Instruction` whose result is the value of the operand.
103-
*/
104-
deprecated final Instruction getDefinitionInstruction() { result = this.getAnyDef() }
105-
10690
/**
10791
* Gets the overlap relationship between the operand's definition and its use.
10892
*/

cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/Operand.qll

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,6 @@ class Operand extends TStageOperand {
8787
this.getDefinitionOverlap() instanceof MustExactlyOverlap
8888
}
8989

90-
/**
91-
* DEPRECATED: renamed to `getUse`.
92-
*
93-
* Gets the `Instruction` that consumes this operand.
94-
*/
95-
deprecated final Instruction getUseInstruction() { result = this.getUse() }
96-
97-
/**
98-
* DEPRECATED: use `getAnyDef` or `getDef`. The exact replacement for this
99-
* predicate is `getAnyDef`, but most uses of this predicate should probably
100-
* be replaced with `getDef`.
101-
*
102-
* Gets the `Instruction` whose result is the value of the operand.
103-
*/
104-
deprecated final Instruction getDefinitionInstruction() { result = this.getAnyDef() }
105-
10690
/**
10791
* Gets the overlap relationship between the operand's definition and its use.
10892
*/

cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Operand.qll

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,6 @@ class Operand extends TStageOperand {
8787
this.getDefinitionOverlap() instanceof MustExactlyOverlap
8888
}
8989

90-
/**
91-
* DEPRECATED: renamed to `getUse`.
92-
*
93-
* Gets the `Instruction` that consumes this operand.
94-
*/
95-
deprecated final Instruction getUseInstruction() { result = this.getUse() }
96-
97-
/**
98-
* DEPRECATED: use `getAnyDef` or `getDef`. The exact replacement for this
99-
* predicate is `getAnyDef`, but most uses of this predicate should probably
100-
* be replaced with `getDef`.
101-
*
102-
* Gets the `Instruction` whose result is the value of the operand.
103-
*/
104-
deprecated final Instruction getDefinitionInstruction() { result = this.getAnyDef() }
105-
10690
/**
10791
* Gets the overlap relationship between the operand's definition and its use.
10892
*/

0 commit comments

Comments
 (0)