Skip to content

Commit f00f2c6

Browse files
committed
SSA: Deprecate public SsaDefinitionExtNode and SsaInputNode.
1 parent 1f628d0 commit f00f2c6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

shared/ssa/codeql/ssa/Ssa.qll

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
16751675
override string toString() { result = def.toString() }
16761676
}
16771677

1678-
final class SsaDefinitionExtNode = SsaDefinitionExtNodeImpl;
1678+
deprecated final class SsaDefinitionExtNode = SsaDefinitionExtNodeImpl;
16791679

16801680
/** An SSA definition, viewed as a node in a data flow graph. */
16811681
private class SsaDefinitionNodeImpl extends SsaDefinitionExtNodeImpl {
@@ -1753,7 +1753,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
17531753
override string toString() { result = "[input] " + def_.toString() }
17541754
}
17551755

1756-
final class SsaInputNode = SsaInputNodeImpl;
1756+
deprecated final class SsaInputNode = SsaInputNodeImpl;
17571757

17581758
/**
17591759
* Holds if `nodeFrom` corresponds to the reference to `v` at index `i` in
@@ -1765,7 +1765,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
17651765
private predicate flowOutOf(
17661766
DefinitionExt def, Node nodeFrom, SourceVariable v, BasicBlock bb, int i, boolean isUseStep
17671767
) {
1768-
nodeFrom.(SsaDefinitionExtNode).getDefinitionExt() = def and
1768+
nodeFrom.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
17691769
def.definesAt(v, bb, i, _) and
17701770
isUseStep = false
17711771
or
@@ -1788,7 +1788,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
17881788
// Flow from parameter into entry definition
17891789
DfInput::ssaDefInitializesParam(def, nodeFrom.(ParameterNode).getParameter())
17901790
) and
1791-
nodeTo.(SsaDefinitionExtNode).getDefinitionExt() = def and
1791+
nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
17921792
isUseStep = false
17931793
or
17941794
// Flow from definition/read to next read
@@ -1804,7 +1804,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
18041804
AdjacentSsaRefs::adjacentRefRead(bb1, i1, bb2, i2, v) and
18051805
exists(UncertainWriteDefinition def2 |
18061806
DfInput::allowFlowIntoUncertainDef(def2) and
1807-
nodeTo.(SsaDefinitionExtNode).getDefinitionExt() = def2 and
1807+
nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def2 and
18081808
def2.definesAt(v, bb2, i2)
18091809
)
18101810
)
@@ -1821,8 +1821,8 @@ module Make<LocationSig Location, InputSig<Location> Input> {
18211821
)
18221822
or
18231823
// Flow from input node to def
1824-
nodeTo.(SsaDefinitionExtNode).getDefinitionExt() = def and
1825-
def = nodeFrom.(SsaInputNode).getDefinitionExt() and
1824+
nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
1825+
def = nodeFrom.(SsaInputNodeImpl).getDefinitionExt() and
18261826
isUseStep = false
18271827
}
18281828

@@ -1835,10 +1835,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
18351835
// Flow from parameter into entry definition
18361836
DfInput::ssaDefInitializesParam(def, nodeFrom.(ParameterNode).getParameter())
18371837
) and
1838-
nodeTo.(SsaDefinitionExtNode).getDefinitionExt() = def
1838+
nodeTo.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def
18391839
or
18401840
// Flow from SSA definition to read
1841-
nodeFrom.(SsaDefinitionExtNode).getDefinitionExt() = def and
1841+
nodeFrom.(SsaDefinitionExtNodeImpl).getDefinitionExt() = def and
18421842
nodeTo.(ExprNode).getExpr() = DfInput::getARead(def)
18431843
}
18441844

@@ -1852,7 +1852,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
18521852
signature predicate guardChecksSig(DfInput::Guard g, DfInput::Expr e, boolean branch);
18531853

18541854
pragma[nomagic]
1855-
private Definition getAPhiInputDef(SsaInputNode n) {
1855+
private Definition getAPhiInputDef(SsaInputNodeImpl n) {
18561856
exists(SsaInputDefinitionExt phi, BasicBlock bb |
18571857
result = getAPhiInputDef(phi, bb) and
18581858
n.isInputInto(phi, bb)
@@ -1927,7 +1927,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
19271927
// guard controls input block to a phi node
19281928
exists(SsaInputDefinitionExt phi |
19291929
def = getAPhiInputDef(result) and
1930-
result.(SsaInputNode).isInputInto(phi, bb)
1930+
result.(SsaInputNodeImpl).isInputInto(phi, bb)
19311931
|
19321932
DfInput::guardControlsBlock(g, bb, branch)
19331933
or

0 commit comments

Comments
 (0)