Skip to content

Commit ebac171

Browse files
committed
Java/Shared: Rename 'joinStep0' to 'joinStep'.
1 parent 6a65c46 commit ebac171

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private module Input implements TypeFlowInput<J::Location> {
7575
* Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
7676
* necessarily functionally determined by `n2`.
7777
*/
78-
predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2) {
78+
predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) {
7979
n2.asExpr().(ChooseExpr).getAResultExpr() = n1.asExpr()
8080
or
8181
exists(Field f, Expr e |
@@ -134,7 +134,7 @@ private module Input implements TypeFlowInput<J::Location> {
134134
not exists(decl.getInit())
135135
)
136136
or
137-
forex(TypeFlowNode mid | joinStep0(mid, n) | Make<J::Location, Input>::isNull(mid)) and
137+
forex(TypeFlowNode mid | joinStep(mid, n) | Make<J::Location, Input>::isNull(mid)) and
138138
// Fields that are never assigned a non-null value are probably set by
139139
// reflection and are thus not always null.
140140
not exists(n.asField())

shared/typeflow/codeql/typeflow/TypeFlow.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ signature module TypeFlowInput<LocationSig Location> {
3131
* Holds if data can flow from `n1` to `n2` in one step, and `n1` is not
3232
* necessarily functionally determined by `n2`.
3333
*/
34-
predicate joinStep0(TypeFlowNode n1, TypeFlowNode n2);
34+
predicate joinStep(TypeFlowNode n1, TypeFlowNode n2);
3535

3636
/**
3737
* Holds if data can flow from `n1` to `n2` in one step, and `n1` is

shared/typeflow/codeql/typeflow/internal/TypeFlowImpl.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module TypeFlow<LocationSig Location, TypeFlowInput<Location> I> {
1616
* Holds if data can flow from `n1` to `n2` in one step, `n1` is not necessarily
1717
* functionally determined by `n2`, and `n1` might take a non-null value.
1818
*/
19-
predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep0(n1, n2) and not isNull(n1) }
19+
predicate joinStep(TypeFlowNode n1, TypeFlowNode n2) { I::joinStep(n1, n2) and not isNull(n1) }
2020

2121
private predicate anyStep(TypeFlowNode n1, TypeFlowNode n2) { joinStep(n1, n2) or step(n1, n2) }
2222

0 commit comments

Comments
 (0)