Skip to content

Commit 37f8794

Browse files
aschackmullaschackmull
authored
Merge pull request #6165 from edoardopirovano/fix-regression
Performance: Improve join order in data flow library
2 parents d325d2a + 8354f66 commit 37f8794

File tree

24 files changed

+144
-144
lines changed

24 files changed

+144
-144
lines changed

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

‎csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ private module Stage2 {
13931393
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
13941394
parameterFlow(p, ap, ap0, c, config) and
13951395
c = ret.getEnclosingCallable() and
1396-
revFlow(ret, true, apSome(_), ap0, config) and
1397-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
1396+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
13981397
pragma[only_bind_into](config)) and
1398+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
13991399
kind = ret.getKind() and
14001400
p.getPosition() = pos and
14011401
// we don't expect a parameter to return stored in itself
@@ -2087,9 +2087,9 @@ private module Stage3 {
20872087
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
20882088
parameterFlow(p, ap, ap0, c, config) and
20892089
c = ret.getEnclosingCallable() and
2090-
revFlow(ret, true, apSome(_), ap0, config) and
2091-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2090+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
20922091
pragma[only_bind_into](config)) and
2092+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
20932093
kind = ret.getKind() and
20942094
p.getPosition() = pos and
20952095
// we don't expect a parameter to return stored in itself
@@ -2850,9 +2850,9 @@ private module Stage4 {
28502850
exists(RetNodeEx ret, Ap ap0, ReturnKindExt kind, int pos |
28512851
parameterFlow(p, ap, ap0, c, config) and
28522852
c = ret.getEnclosingCallable() and
2853-
revFlow(ret, true, apSome(_), ap0, config) and
2854-
fwdFlow(ret, any(CcCall ccc), apSome(ap), pragma[only_bind_into](ap0),
2853+
revFlow(pragma[only_bind_into](ret), true, apSome(_), pragma[only_bind_into](ap0),
28552854
pragma[only_bind_into](config)) and
2855+
fwdFlow(ret, any(CcCall ccc), apSome(ap), ap0, config) and
28562856
kind = ret.getKind() and
28572857
p.getPosition() = pos and
28582858
// we don't expect a parameter to return stored in itself

0 commit comments

Comments
 (0)