Skip to content

Commit 6ba7f9a

Browse files
erik-krogherik-krogh
authored
Merge pull request #13352 from erik-krogh/once-again-deps-not-py-cpp
delete old deprecations
2 parents 46b3045 + ac9ede4 commit 6ba7f9a

109 files changed

Lines changed: 35 additions & 1124 deletions

File tree

Some content is hidden

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

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@ class Instruction extends Construction::TStageInstruction {
210210
*/
211211
final Language::AST getAst() { result = Construction::getInstructionAst(this) }
212212

213-
/** DEPRECATED: Alias for getAst */
214-
deprecated Language::AST getAST() { result = this.getAst() }
215-
216213
/**
217214
* Gets the location of the source code for this instruction.
218215
*/
@@ -463,9 +460,6 @@ class VariableInstruction extends Instruction {
463460
* Gets the AST variable that this instruction's IR variable refers to, if one exists.
464461
*/
465462
final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
466-
467-
/** DEPRECATED: Alias for getAstVariable */
468-
deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
469463
}
470464

471465
/**

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,6 @@ private module Cached {
422422
)
423423
}
424424

425-
/** DEPRECATED: Alias for getInstructionAst */
426-
cached
427-
deprecated Language::AST getInstructionAST(Instruction instr) {
428-
result = getInstructionAst(instr)
429-
}
430-
431425
cached
432426
Language::LanguageType getInstructionResultType(Instruction instr) {
433427
result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -993,9 +987,6 @@ predicate canReuseSsaForMemoryResult(Instruction instruction) {
993987
// We don't support reusing SSA for any location that could create a `Chi` instruction.
994988
}
995989

996-
/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
997-
deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
998-
999990
/**
1000991
* Expose some of the internal predicates to PrintSSA.qll. We do this by publicly importing those modules in the
1001992
* `DebugSsa` module, which is then imported by PrintSSA.
@@ -1005,9 +996,6 @@ module DebugSsa {
1005996
import DefUse
1006997
}
1007998

1008-
/** DEPRECATED: Alias for DebugSsa */
1009-
deprecated module DebugSSA = DebugSsa;
1010-
1011999
import CachedForDebugging
10121000

10131001
cached

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ module UnaliasedSsaInstructions {
7373
}
7474
}
7575

76-
/** DEPRECATED: Alias for UnaliasedSsaInstructions */
77-
deprecated module UnaliasedSSAInstructions = UnaliasedSsaInstructions;
78-
7976
/**
8077
* Provides wrappers for the constructors of each branch of `TInstruction` that is used by the
8178
* aliased SSA stage.
@@ -107,6 +104,3 @@ module AliasedSsaInstructions {
107104
result = TAliasedSsaUnreachedInstruction(irFunc)
108105
}
109106
}
110-
111-
/** DEPRECATED: Alias for AliasedSsaInstructions */
112-
deprecated module AliasedSSAInstructions = AliasedSsaInstructions;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@ class Instruction extends Construction::TStageInstruction {
210210
*/
211211
final Language::AST getAst() { result = Construction::getInstructionAst(this) }
212212

213-
/** DEPRECATED: Alias for getAst */
214-
deprecated Language::AST getAST() { result = this.getAst() }
215-
216213
/**
217214
* Gets the location of the source code for this instruction.
218215
*/
@@ -463,9 +460,6 @@ class VariableInstruction extends Instruction {
463460
* Gets the AST variable that this instruction's IR variable refers to, if one exists.
464461
*/
465462
final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
466-
467-
/** DEPRECATED: Alias for getAstVariable */
468-
deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
469463
}
470464

471465
/**

‎cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/Instruction.qll‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@ class Instruction extends Construction::TStageInstruction {
210210
*/
211211
final Language::AST getAst() { result = Construction::getInstructionAst(this) }
212212

213-
/** DEPRECATED: Alias for getAst */
214-
deprecated Language::AST getAST() { result = this.getAst() }
215-
216213
/**
217214
* Gets the location of the source code for this instruction.
218215
*/
@@ -463,9 +460,6 @@ class VariableInstruction extends Instruction {
463460
* Gets the AST variable that this instruction's IR variable refers to, if one exists.
464461
*/
465462
final Language::Variable getAstVariable() { result = var.(IRUserVariable).getVariable() }
466-
467-
/** DEPRECATED: Alias for getAstVariable */
468-
deprecated Language::Variable getASTVariable() { result = this.getAstVariable() }
469463
}
470464

471465
/**

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,6 @@ private module Cached {
422422
)
423423
}
424424

425-
/** DEPRECATED: Alias for getInstructionAst */
426-
cached
427-
deprecated Language::AST getInstructionAST(Instruction instr) {
428-
result = getInstructionAst(instr)
429-
}
430-
431425
cached
432426
Language::LanguageType getInstructionResultType(Instruction instr) {
433427
result = instr.(RawIR::Instruction).getResultLanguageType()
@@ -993,9 +987,6 @@ predicate canReuseSsaForMemoryResult(Instruction instruction) {
993987
// We don't support reusing SSA for any location that could create a `Chi` instruction.
994988
}
995989

996-
/** DEPRECATED: Alias for canReuseSsaForMemoryResult */
997-
deprecated predicate canReuseSSAForMemoryResult = canReuseSsaForMemoryResult/1;
998-
999990
/**
1000991
* Expose some of the internal predicates to PrintSSA.qll. We do this by publicly importing those modules in the
1001992
* `DebugSsa` module, which is then imported by PrintSSA.
@@ -1005,9 +996,6 @@ module DebugSsa {
1005996
import DefUse
1006997
}
1007998

1008-
/** DEPRECATED: Alias for DebugSsa */
1009-
deprecated module DebugSSA = DebugSsa;
1010-
1011999
import CachedForDebugging
10121000

10131001
cached

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ predicate canReuseSsaForVariable(IRAutomaticVariable var) {
4646
not allocationEscapes(var)
4747
}
4848

49-
/** DEPRECATED: Alias for canReuseSsaForVariable */
50-
deprecated predicate canReuseSSAForVariable = canReuseSsaForVariable/1;
51-
5249
private newtype TMemoryLocation = MkMemoryLocation(Allocation var) { isVariableModeled(var) }
5350

5451
private MemoryLocation getMemoryLocation(Allocation var) { result.getAllocation() = var }
@@ -80,9 +77,6 @@ class MemoryLocation extends TMemoryLocation {
8077

8178
predicate canReuseSsaForOldResult(Instruction instr) { none() }
8279

83-
/** DEPRECATED: Alias for canReuseSsaForOldResult */
84-
deprecated predicate canReuseSSAForOldResult = canReuseSsaForOldResult/1;
85-
8680
/**
8781
* Represents a set of `MemoryLocation`s that cannot overlap with
8882
* `MemoryLocation`s outside of the set. The `VirtualVariable` will be

‎csharp/ql/lib/change-notes/2023-06-02-delete-deps.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Deleted the deprecated `WebConfigXML`, `ConfigurationXMLElement`, `LocationXMLElement`, `SystemWebXMLElement`, `SystemWebServerXMLElement`, `CustomErrorsXMLElement`, and `HttpRuntimeXMLElement` classes from `WebConfig.qll`. The non-deprecated names with PascalCased Xml suffixes should be used instead.
5+
* Deleted the deprecated `Record` class from both `Types.qll` and `Type.qll`.
6+
* Deleted the deprecated `StructuralComparisonConfiguration` class from `StructuralComparison.qll`, use `sameGvn` instead.
7+
* Deleted the deprecated `isParameterOf` predicate from the `ParameterNode` class.
8+
* Deleted the deprecated `SafeExternalAPICallable`, `ExternalAPIDataNode`, `UntrustedDataToExternalAPIConfig`, `UntrustedExternalAPIDataNode`, and `ExternalAPIUsedWithUntrustedData` classes from `ExternalAPIsQuery.qll`. The non-deprecated names with PascalCased Api suffixes should be used instead.

‎csharp/ql/lib/semmle/code/asp/WebConfig.qll‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ class WebConfigReleaseTransformXml extends XmlFile {
1818
WebConfigReleaseTransformXml() { this.getName().matches("%Web.Release.config") }
1919
}
2020

21-
/** DEPRECATED: Alias for WebConfigXml */
22-
deprecated class WebConfigXML = WebConfigXml;
23-
2421
/** A `<configuration>` tag in an ASP.NET configuration file. */
2522
class ConfigurationXmlElement extends XmlElement {
2623
ConfigurationXmlElement() { this.getName().toLowerCase() = "configuration" }
@@ -31,9 +28,6 @@ class CompilationXmlElement extends XmlElement {
3128
CompilationXmlElement() { this.getName().toLowerCase() = "compilation" }
3229
}
3330

34-
/** DEPRECATED: Alias for ConfigurationXmlElement */
35-
deprecated class ConfigurationXMLElement = ConfigurationXmlElement;
36-
3731
/** A `<location>` tag in an ASP.NET configuration file. */
3832
class LocationXmlElement extends XmlElement {
3933
LocationXmlElement() {
@@ -42,9 +36,6 @@ class LocationXmlElement extends XmlElement {
4236
}
4337
}
4438

45-
/** DEPRECATED: Alias for LocationXmlElement */
46-
deprecated class LocationXMLElement = LocationXmlElement;
47-
4839
/** A `<system.web>` tag in an ASP.NET configuration file. */
4940
class SystemWebXmlElement extends XmlElement {
5041
SystemWebXmlElement() {
@@ -57,9 +48,6 @@ class SystemWebXmlElement extends XmlElement {
5748
}
5849
}
5950

60-
/** DEPRECATED: Alias for SystemWebXmlElement */
61-
deprecated class SystemWebXMLElement = SystemWebXmlElement;
62-
6351
/** A `<system.webServer>` tag in an ASP.NET configuration file. */
6452
class SystemWebServerXmlElement extends XmlElement {
6553
SystemWebServerXmlElement() {
@@ -72,9 +60,6 @@ class SystemWebServerXmlElement extends XmlElement {
7260
}
7361
}
7462

75-
/** DEPRECATED: Alias for SystemWebServerXmlElement */
76-
deprecated class SystemWebServerXMLElement = SystemWebServerXmlElement;
77-
7863
/** A `<customErrors>` tag in an ASP.NET configuration file. */
7964
class CustomErrorsXmlElement extends XmlElement {
8065
CustomErrorsXmlElement() {
@@ -83,9 +68,6 @@ class CustomErrorsXmlElement extends XmlElement {
8368
}
8469
}
8570

86-
/** DEPRECATED: Alias for CustomErrorsXmlElement */
87-
deprecated class CustomErrorsXMLElement = CustomErrorsXmlElement;
88-
8971
/** A `<httpRuntime>` tag in an ASP.NET configuration file. */
9072
class HttpRuntimeXmlElement extends XmlElement {
9173
HttpRuntimeXmlElement() {
@@ -94,9 +76,6 @@ class HttpRuntimeXmlElement extends XmlElement {
9476
}
9577
}
9678

97-
/** DEPRECATED: Alias for HttpRuntimeXmlElement */
98-
deprecated class HttpRuntimeXMLElement = HttpRuntimeXmlElement;
99-
10079
/** A `<forms>` tag under `<system.web><authentication>` in an ASP.NET configuration file. */
10180
class FormsElement extends XmlElement {
10281
FormsElement() {

‎csharp/ql/lib/semmle/code/cil/Types.qll‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ class Class extends ValueOrRefType {
6060
Class() { this.isClass() }
6161
}
6262

63-
/** A `record`. */
64-
deprecated class Record extends Class {
65-
Record() { this.isRecord() }
66-
}
67-
6863
/** An `interface`. */
6964
class Interface extends ValueOrRefType {
7065
Interface() { this.isInterface() }

0 commit comments

Comments
 (0)