Data flow: Simplify revFlowStore

hvitved · hvitved · commit 24662886561d · 2022-04-25T10:11:54.000+02:00
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll
@@ -782,7 +782,7 @@ private module Stage1 {
   private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {
     exists(NodeEx mid, TypedContent tc |
       revFlow(mid, toReturn, pragma[only_bind_into](config)) and
-      fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and
+      fwdFlowConsCand(c, pragma[only_bind_into](config)) and
       store(node, tc, mid, _, config) and
       c = tc.getContent()
     )

Original file line number	Diff line number	Diff line change
`@@ -782,7 +782,7 @@ private module Stage1 {`
`782`	`782`	`private predicate revFlowStore(Content c, NodeEx node, boolean toReturn, Configuration config) {`
`783`	`783`	`exists(NodeEx mid, TypedContent tc \|`
`784`	`784`	`revFlow(mid, toReturn, pragma[only_bind_into](config)) and`
`785`		`- fwdFlowConsCandSet(_, c, pragma[only_bind_into](config)) and`
	`785`	`+ fwdFlowConsCand(c, pragma[only_bind_into](config)) and`
`786`	`786`	`store(node, tc, mid, _, config) and`
`787`	`787`	`c = tc.getContent()`
`788`	`788`	`)`