Skip to content

Commit b3990c5

Browse files
hvitvedhvitved
committed
Data flow: Revert reordering changes in flowStore and flowRead 
1 parent 5baa133 commit b3990c5

File tree

19 files changed

+76
-76
lines changed

19 files changed

+76
-76
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,19 +1536,19 @@ private predicate flow0(Node node, boolean toReturn, AccessPath ap, Configuratio
15361536
)
15371537
or
15381538
exists(Content f, AccessPath ap0 |
1539-
flowStore(ap0, f, node, toReturn, config) and
1539+
flowStore(node, f, toReturn, ap0, config) and
15401540
pop(ap0, f, ap)
15411541
)
15421542
or
15431543
exists(Content f, AccessPath ap0 |
1544-
flowRead(f, ap0, node, toReturn, config) and
1544+
flowRead(node, f, toReturn, ap0, config) and
15451545
push(ap0, f, ap)
15461546
)
15471547
}
15481548

15491549
pragma[nomagic]
15501550
private predicate flowStore(
1551-
AccessPath ap0, Content f, Node node, boolean toReturn, Configuration config
1551+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15521552
) {
15531553
exists(Node mid |
15541554
store(node, f, mid) and
@@ -1558,7 +1558,7 @@ private predicate flowStore(
15581558

15591559
pragma[nomagic]
15601560
private predicate flowRead(
1561-
Content f, AccessPath ap0, Node node, boolean toReturn, Configuration config
1561+
Node node, Content f, boolean toReturn, AccessPath ap0, Configuration config
15621562
) {
15631563
exists(Node mid |
15641564
read(node, f, mid) and

0 commit comments

Comments
 (0)