Skip to content

Commit 59636c4

Browse files
committed
Dataflow: Rename two private predicates.
1 parent f222cce commit 59636c4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ module Private {
872872
}
873873

874874
pragma[nomagic]
875-
private ParamNode summaryArgParam0(DataFlowCall call, ArgNode arg, SummarizedCallable sc) {
875+
private ParamNode summaryArgParam(DataFlowCall call, ArgNode arg, SummarizedCallable sc) {
876876
exists(ParameterPosition ppos |
877877
argumentPositionMatch(call, arg, ppos) and
878878
viableParam(call, sc, ppos, result)
@@ -911,18 +911,18 @@ module Private {
911911
predicate prohibitsUseUseFlow(ArgNode arg, SummarizedCallable sc) {
912912
exists(ParamNode p, ParameterPosition ppos, Node ret |
913913
paramReachesLocal(p, ret, true) and
914-
p = summaryArgParam0(_, arg, sc) and
914+
p = summaryArgParam(_, arg, sc) and
915915
p.isParameterOf(_, pragma[only_bind_into](ppos)) and
916916
isParameterPostUpdate(ret, _, pragma[only_bind_into](ppos))
917917
)
918918
}
919919

920920
bindingset[ret]
921-
private ParamNode summaryArgParam(
921+
private ParamNode summaryArgParamRetOut(
922922
ArgNode arg, ReturnNodeExt ret, OutNodeExt out, SummarizedCallable sc
923923
) {
924924
exists(DataFlowCall call, ReturnKindExt rk |
925-
result = summaryArgParam0(call, arg, sc) and
925+
result = summaryArgParam(call, arg, sc) and
926926
ret.getKind() = pragma[only_bind_into](rk) and
927927
out = pragma[only_bind_into](rk).getAnOutNode(call)
928928
)
@@ -937,7 +937,7 @@ module Private {
937937
*/
938938
predicate summaryThroughStepValue(ArgNode arg, Node out, SummarizedCallable sc) {
939939
exists(ReturnKind rk, ReturnNode ret, DataFlowCall call |
940-
summaryLocalStep(summaryArgParam0(call, arg, sc), ret, true) and
940+
summaryLocalStep(summaryArgParam(call, arg, sc), ret, true) and
941941
ret.getKind() = pragma[only_bind_into](rk) and
942942
out = getAnOutNode(call, pragma[only_bind_into](rk))
943943
)
@@ -951,7 +951,7 @@ module Private {
951951
* be useful to include in the exposed local data-flow/taint-tracking relations.
952952
*/
953953
predicate summaryThroughStepTaint(ArgNode arg, Node out, SummarizedCallable sc) {
954-
exists(ReturnNodeExt ret | summaryLocalStep(summaryArgParam(arg, ret, out, sc), ret, false))
954+
exists(ReturnNodeExt ret | summaryLocalStep(summaryArgParamRetOut(arg, ret, out, sc), ret, false))
955955
}
956956

957957
/**
@@ -963,7 +963,7 @@ module Private {
963963
*/
964964
predicate summaryGetterStep(ArgNode arg, ContentSet c, Node out, SummarizedCallable sc) {
965965
exists(Node mid, ReturnNodeExt ret |
966-
summaryReadStep(summaryArgParam(arg, ret, out, sc), c, mid) and
966+
summaryReadStep(summaryArgParamRetOut(arg, ret, out, sc), c, mid) and
967967
summaryLocalStep(mid, ret, _)
968968
)
969969
}
@@ -977,7 +977,7 @@ module Private {
977977
*/
978978
predicate summarySetterStep(ArgNode arg, ContentSet c, Node out, SummarizedCallable sc) {
979979
exists(Node mid, ReturnNodeExt ret |
980-
summaryLocalStep(summaryArgParam(arg, ret, out, sc), mid, _) and
980+
summaryLocalStep(summaryArgParamRetOut(arg, ret, out, sc), mid, _) and
981981
summaryStoreStep(mid, c, ret)
982982
)
983983
}

0 commit comments

Comments
 (0)