Skip to content

Commit 405e322

Browse files
committed
unified: Remove superfluous forwarding-predicate
isMutatedByCallOrAssign was a synonym for hasPostUpdateAfterCallOrAssign
1 parent 0d1b4b9 commit 405e322

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

‎unified/ql/lib/codeql/unified/internal/dataflow/DataFlowCall.qll‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private newtype TDataFlowCall =
2020
isInAssignmentContext(expr, _)
2121
or
2222
// Write back a value that was mutated in-place, such as `x.p` in `x.p.f = y`
23-
isMutatedByCallOrAssign(expr, _) and
23+
hasPostUpdateAfterCallOrAssign(expr, _) and
2424
mayWriteBackViaSetterCall(expr)
2525
) and
2626
(

‎unified/ql/lib/codeql/unified/internal/dataflow/DataFlowNode.qll‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private predicate hasIncomingValueAtCfgNode(Expr expr, ControlFlowNode cfgNode)
2828
}
2929

3030
/** Holds if `expr` has a post-update at `cfgNode` resulting from a surrounding call or assignment. */
31-
private predicate hasPostUpdateAfterCallOrAssign(Expr expr, ControlFlowNode cfgNode) {
31+
predicate hasPostUpdateAfterCallOrAssign(Expr expr, ControlFlowNode cfgNode) {
3232
exists(MemberAccessExpr member |
3333
(hasIncomingValueAtCfgNode(member, cfgNode) or hasPostUpdateAfterCallOrAssign(member, cfgNode)) and
3434
expr = member.getBase()
@@ -46,14 +46,6 @@ private predicate hasPostUpdateAfterCallOrAssign(Expr expr, ControlFlowNode cfgN
4646
)
4747
}
4848

49-
/**
50-
* Holds if the value of `expr` is mutated at `cfgNode` by a surrounding call or assignment,
51-
* and thus needs to be written back if `expr` refers to a computed value.
52-
*/
53-
predicate isMutatedByCallOrAssign(Expr expr, ControlFlowNode cfgNode) {
54-
hasPostUpdateAfterCallOrAssign(expr, cfgNode)
55-
}
56-
5749
/**
5850
* Holds if `expr` has a post-update at `cfgNode`.
5951
*/
@@ -420,7 +412,7 @@ class BuilderNode extends TDataFlowNodeStage1 {
420412
or
421413
// Setter invoked to write back a mutated value
422414
not isInAssignmentContext(access, _) and
423-
isMutatedByCallOrAssign(access, cfgNode)
415+
hasPostUpdate(access, cfgNode)
424416
)
425417
)
426418
)

0 commit comments

Comments
 (0)