Dataflow: Review fix.

aschackmull · aschackmull · commit 4884520ee16b · 2022-05-11T15:40:49.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
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
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
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
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
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
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
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
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
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(
   )
 }
 
+pragma[nomagic]
 private predicate nodeMayUseSummary(
   NodeEx n, FlowState state, AccessPathApprox apa, Configuration config
 ) {
   exists(DataFlowCallable c |
-    Stage4::parameterMayFlowThrough(_, c, apa, _) and
+    Stage4::parameterMayFlowThrough(_, c, apa, config) and
     nodeMayUseSummary0(n, c, state, apa, config)
   )
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll

Original file line number	Diff line number	Diff line change
`@@ -3448,11 +3448,12 @@ private predicate nodeMayUseSummary0(`
`3448`	`3448`	`)`
`3449`	`3449`	`}`
`3450`	`3450`
	`3451`	`+pragma[nomagic]`
`3451`	`3452`	`private predicate nodeMayUseSummary(`
`3452`	`3453`	`NodeEx n, FlowState state, AccessPathApprox apa, Configuration config`
`3453`	`3454`	`) {`
`3454`	`3455`	`exists(DataFlowCallable c \|`
`3455`		`- Stage4::parameterMayFlowThrough(_, c, apa, _) and`
	`3456`	`+ Stage4::parameterMayFlowThrough(_, c, apa, config) and`
`3456`	`3457`	`nodeMayUseSummary0(n, c, state, apa, config)`
`3457`	`3458`	`)`
`3458`	`3459`	`}`