Skip to content

Commit 6e3749f

Browse files
committed
C#: Remove references to getAFirstReadAtNode.
1 parent 0f431c9 commit 6e3749f

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

csharp/ql/lib/semmle/code/csharp/Assignable.qll

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -488,15 +488,10 @@ class AssignableDefinition extends TAssignableDefinition {
488488
*/
489489
pragma[nomagic]
490490
AssignableRead getAFirstRead() {
491-
exists(ControlFlowNode cfn | cfn = result.getControlFlowNode() |
492-
exists(Ssa::ExplicitDefinition def | result = def.getAFirstReadAtNode(cfn) |
493-
this = def.getADefinition()
494-
)
495-
or
496-
exists(Ssa::ImplicitParameterDefinition def | result = def.getAFirstReadAtNode(cfn) |
497-
this.(AssignableDefinitions::ImplicitParameterDefinition).getParameter() =
498-
def.getParameter()
499-
)
491+
exists(Ssa::ExplicitDefinition def | result = def.getAFirstRead() | this = def.getADefinition())
492+
or
493+
exists(Ssa::ImplicitParameterDefinition def | result = def.getAFirstRead() |
494+
this.(AssignableDefinitions::ImplicitParameterDefinition).getParameter() = def.getParameter()
500495
)
501496
}
502497

csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ private Ssa::Definition getAnUltimateDefinition(Ssa::Definition def) {
255255
* exception.
256256
*/
257257
private predicate defReaches(Ssa::Definition def, ControlFlowNode cfn) {
258-
exists(def.getAFirstReadAtNode(cfn))
258+
def.getAFirstRead().getControlFlowNode() = cfn
259259
or
260260
exists(ControlFlowNode mid | defReaches(def, mid) |
261261
SsaImpl::adjacentReadPairSameVar(_, mid, cfn) and

0 commit comments

Comments
 (0)