Address review comment

hvitved · hvitved · commit f7a5a33474b5 · 2023-02-13T09:01:15.000+01:00
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/experimental/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
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
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
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
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
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
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
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
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplForStringsNewReplacer.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImplForStringsNewReplacer.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplForRegExp.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplForRegExp.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForHttpClientLibraries.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForPathname.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll
@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {
     (
       cc = false
       or
+      cc = true and
       not reducedViableImplInCallContext(call, _, _)
     )
     or

Original file line number	Diff line number	Diff line change
`@@ -693,6 +693,7 @@ private module Stage1 implements StageSig {`
`693`	`693`	`(`
`694`	`694`	`cc = false`
`695`	`695`	`or`
	`696`	`+ cc = true and`
`696`	`697`	`not reducedViableImplInCallContext(call, _, _)`
`697`	`698`	`)`
`698`	`699`	`or`