Skip to content

Shared: Remove deprecated code #21748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hvitved merged 4 commits into from
Apr 23, 2026
Merged

Shared: Remove deprecated code #21748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90ae086
Shared: Remove deprecated code
hvitved Apr 23, 2026
14dd72b
C#: Remove deprecated references to deprecated shared code
hvitved Apr 23, 2026
18da5f6
Ruby: Remove deprecated references to deprecated shared code
hvitved Apr 23, 2026
61f1ef8
Swift: Remove deprecated references to deprecated shared code
hvitved Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,69 +311,6 @@ module Ssa {
result.getControlFlowNode() = cfn
}

/**
* Gets a last read of the source variable underlying this SSA definition.
* That is, a read that can reach the end of the enclosing callable, or
* another SSA definition for the source variable, without passing through
* any other read. Example:
*
* ```csharp
* int Field;
*
* void SetField(int i) {
* this.Field = i;
* Use(this.Field);
* if (i > 0)
* this.Field = i - 1;
* else if (i < 0)
* SetField(1);
* Use(this.Field);
* Use(this.Field);
* }
* ```
*
* - The reads of `i` on lines 7 and 8 are the last reads for the implicit
* parameter definition on line 3.
* - The read of `this.Field` on line 5 is a last read of the definition on
* line 4.
* - The read of `this.Field` on line 11 is a last read of the phi node
* between lines 9 and 10.
*/
deprecated final AssignableRead getALastRead() { result = this.getALastReadAtNode(_) }

/**
* Gets a last read of the source variable underlying this SSA definition at
* control flow node `cfn`. That is, a read that can reach the end of the
* enclosing callable, or another SSA definition for the source variable,
* without passing through any other read. Example:
*
* ```csharp
* int Field;
*
* void SetField(int i) {
* this.Field = i;
* Use(this.Field);
* if (i > 0)
* this.Field = i - 1;
* else if (i < 0)
* SetField(1);
* Use(this.Field);
* Use(this.Field);
* }
* ```
*
* - The reads of `i` on lines 7 and 8 are the last reads for the implicit
* parameter definition on line 3.
* - The read of `this.Field` on line 5 is a last read of the definition on
* line 4.
* - The read of `this.Field` on line 11 is a last read of the phi node
* between lines 9 and 10.
*/
deprecated final AssignableRead getALastReadAtNode(ControlFlowNode cfn) {
SsaImpl::lastReadSameVar(this, cfn) and
result.getControlFlowNode() = cfn
}

/**
* Gets an SSA definition whose value can flow to this one in one step. This
* includes inputs to phi nodes and the prior definitions of uncertain writes.
Expand Down
55 changes: 0 additions & 55 deletions csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,61 +713,6 @@ private predicate variableReadPseudo(BasicBlock bb, int i, Ssa::SourceVariable v
refReadBeforeWrite(bb, i, v)
}

pragma[noinline]
deprecated private predicate adjacentDefRead(
Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
) {
Impl::adjacentDefRead(def, bb1, i1, bb2, i2) and
v = def.getSourceVariable()
}

deprecated private predicate adjacentDefReachesRead(
Definition def, SsaInput::SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2
) {
adjacentDefRead(def, bb1, i1, bb2, i2, v) and
(
def.definesAt(v, bb1, i1)
or
SsaInput::variableRead(bb1, i1, v, true)
)
or
exists(BasicBlock bb3, int i3 |
adjacentDefReachesRead(def, v, bb1, i1, bb3, i3) and
SsaInput::variableRead(bb3, i3, _, false) and
Impl::adjacentDefRead(def, bb3, i3, bb2, i2)
)
}

deprecated private predicate adjacentDefReachesUncertainRead(
Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
) {
exists(SsaInput::SourceVariable v |
adjacentDefReachesRead(def, v, bb1, i1, bb2, i2) and
SsaInput::variableRead(bb2, i2, v, false)
)
}

/** Same as `lastRefRedef`, but skips uncertain reads. */
pragma[nomagic]
deprecated private predicate lastRefSkipUncertainReads(Definition def, BasicBlock bb, int i) {
Impl::lastRef(def, bb, i) and
not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
or
exists(BasicBlock bb0, int i0 |
Impl::lastRef(def, bb0, i0) and
adjacentDefReachesUncertainRead(def, bb, i, bb0, i0)
)
}

pragma[nomagic]
deprecated predicate lastReadSameVar(Definition def, ControlFlowNode cfn) {
exists(BasicBlock bb, int i |
lastRefSkipUncertainReads(def, bb, i) and
variableReadActual(bb, i, _) and
cfn = bb.getNode(i)
)
}

cached
private module Cached {
cached
Expand Down
28 changes: 0 additions & 28 deletions ruby/ql/lib/codeql/ruby/dataflow/SSA.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,34 +78,6 @@ module Ssa {
*/
final VariableReadAccessCfgNode getAFirstRead() { SsaImpl::firstRead(this, result) }

/**
* Gets a last control-flow node that reads the value of this SSA definition.
* That is, a read that can reach the end of the enclosing CFG scope, or another
* SSA definition for the source variable, without passing through any other read.
*
* Example:
*
* ```rb
* def m b # defines b_0
* i = 0 # defines i_0
* puts i
* puts i + 1 # last read of i_0
* if b # last read of b_0
* i = 1 # defines i_1
* puts i
* puts i + 1 # last read of i_1
* else
* i = 2 # defines i_2
* puts i
* puts i + 1 # last read of i_2
* end
* # defines i_3 = phi(i_1, i_2)
* puts i # last read of i3
* end
* ```
*/
deprecated final VariableReadAccessCfgNode getALastRead() { SsaImpl::lastRead(this, result) }

/**
* Holds if `read1` and `read2` are adjacent reads of this SSA definition.
* That is, `read2` can be reached from `read1` without passing through
Expand Down
57 changes: 0 additions & 57 deletions ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,63 +212,6 @@ private predicate hasVariableReadWithCapturedWrite(
variableReadActualInOuterScope(bb, i, v, scope)
}

pragma[noinline]
deprecated private predicate adjacentDefReadExt(
Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
) {
Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and
v = def.getSourceVariable()
}

deprecated private predicate adjacentDefReachesReadExt(
Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
) {
exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) |
def.definesAt(v, bb1, i1)
or
SsaInput::variableRead(bb1, i1, v, true)
)
or
exists(BasicBlock bb3, int i3 |
adjacentDefReachesReadExt(def, bb1, i1, bb3, i3) and
SsaInput::variableRead(bb3, i3, _, false) and
Impl::adjacentDefReadExt(def, _, bb3, i3, bb2, i2)
)
}

deprecated private predicate adjacentDefReachesUncertainReadExt(
Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
) {
adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and
SsaInput::variableRead(bb2, i2, _, false)
}

/** Same as `lastRefRedef`, but skips uncertain reads. */
pragma[nomagic]
deprecated private predicate lastRefSkipUncertainReadsExt(Definition def, BasicBlock bb, int i) {
Impl::lastRef(def, bb, i) and
not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
or
exists(BasicBlock bb0, int i0 |
Impl::lastRef(def, bb0, i0) and
adjacentDefReachesUncertainReadExt(def, bb, i, bb0, i0)
)
}

/**
* Holds if the read of `def` at `read` may be a last read. That is, `read`
* can either reach another definition of the underlying source variable or
* the end of the CFG scope, without passing through another non-pseudo read.
*/
pragma[nomagic]
deprecated predicate lastRead(Definition def, VariableReadAccessCfgNode read) {
exists(Cfg::BasicBlock bb, int i |
lastRefSkipUncertainReadsExt(def, bb, i) and
variableReadActual(bb, i, _) and
read = bb.getNode(i)
)
}

cached
private module Cached {
/**
Expand Down
11 changes: 0 additions & 11 deletions shared/controlflow/codeql/controlflow/Cfg.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,20 +252,9 @@ module MakeWithSplitting<
rank[i + 1](ControlFlowTree child, int j | child = this.getChildNode(j) | child order by j)
}

/** Gets the first child node of this element. */
deprecated final AstNode getFirstChildNode() { result = this.getChildTreeRanked(0) }

/** Gets the first child node of this element. */
final ControlFlowTree getFirstChildTree() { result = this.getChildTreeRanked(0) }

/** Gets the last child node of this node. */
deprecated final AstNode getLastChildElement() {
exists(int last |
result = this.getChildTreeRanked(last) and
not exists(this.getChildTreeRanked(last + 1))
)
}

/** Gets the last child node of this node. */
final ControlFlowTree getLastChildTree() {
exists(int last |
Expand Down
26 changes: 0 additions & 26 deletions shared/dataflow/codeql/dataflow/DataFlow.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,19 +784,6 @@ private module DataFlowMakeCore<LocationSig Location, InputSig<Location> Lang> {

/** Gets the location of this node. */
Location getLocation() { result = this.getNode().getLocation() }

/**
* Holds if this element is at the specified location.
* The location spans column `startcolumn` of line `startline` to
* column `endcolumn` of line `endline` in file `filepath`.
* For more information, see
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
*/
deprecated predicate hasLocationInfo(
string filepath, int startline, int startcolumn, int endline, int endcolumn
) {
this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
}
}

/**
Expand Down Expand Up @@ -853,19 +840,6 @@ private module DataFlowMakeCore<LocationSig Location, InputSig<Location> Lang> {
/** Gets a textual representation of this element. */
string toString() { result = super.toString() }

/**
* Holds if this element is at the specified location.
* The location spans column `startcolumn` of line `startline` to
* column `endcolumn` of line `endline` in file `filepath`.
* For more information, see
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
*/
deprecated predicate hasLocationInfo(
string filepath, int startline, int startcolumn, int endline, int endcolumn
) {
super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
}

/** Gets the underlying `Node`. */
Node getNode() { result = super.getNode() }

Expand Down
30 changes: 0 additions & 30 deletions shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2531,36 +2531,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {

/** Holds if this node is a sink. */
final predicate isSink() { this instanceof PathNodeSink }

/**
* Holds if this element is at the specified location.
* The location spans column `startcolumn` of line `startline` to
* column `endcolumn` of line `endline` in file `filepath`.
* For more information, see
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
*/
overlay[caller?]
pragma[inline]
deprecated final predicate hasLocationInfo(
string filepath, int startline, int startcolumn, int endline, int endcolumn
) {
this.getLocation()
.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
}

/**
* DEPRECATED: This functionality is no longer available.
*
* Holds if this node is a grouping of source nodes.
*/
deprecated final predicate isSourceGroup(string group) { none() }

/**
* DEPRECATED: This functionality is no longer available.
*
* Holds if this node is a grouping of sink nodes.
*/
deprecated final predicate isSinkGroup(string group) { none() }
}

/** Holds if `n1.getASuccessor() = n2` and `n2` can reach a sink. */
Expand Down
20 changes: 0 additions & 20 deletions shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,6 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
private import Aliases

module DataFlowImplCommonPublic {
/**
* DEPRECATED: Generally, a custom `FlowState` type should be used instead,
* but `string` can of course still be used without referring to this
* module.
*
* Provides `FlowState = string`.
*/
deprecated module FlowStateString {
/** A state value to track during data flow. */
deprecated class FlowState = string;

/**
* The default state, which is used when the state is unspecified for a source
* or a sink.
*/
deprecated class FlowStateEmpty extends FlowState {
FlowStateEmpty() { this = "" }
}
}

private newtype TFlowFeature =
TFeatureHasSourceCallContext() or
TFeatureHasSinkCallContext() or
Expand Down
15 changes: 0 additions & 15 deletions shared/dataflow/codeql/dataflow/internal/DataFlowImplStage1.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1847,21 +1847,6 @@ module MakeImplStage1<LocationSig Location, InputSig<Location> Lang> {
/** Gets the location of this node. */
Location getLocation() { result = this.getNodeEx().getLocation() }

/**
* Holds if this element is at the specified location.
* The location spans column `startcolumn` of line `startline` to
* column `endcolumn` of line `endline` in file `filepath`.
* For more information, see
* [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
*/
overlay[caller?]
pragma[inline]
deprecated predicate hasLocationInfo(
string filepath, int startline, int startcolumn, int endline, int endcolumn
) {
this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
}

/** Gets the underlying `Node`. */
final Node getNode() { this.getNodeEx().projectToNode() = result }

Expand Down
Loading
Loading