Java/C++/C#: Address review comment.

aschackmull · aschackmull · commit 241b8a05e470 · 2020-01-14T11:59:55.000+01:00
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {
 }
 
 private predicate summaryFwd2(Summary s, Configuration config) {
-  s = TSummaryTaint()
-  or
+  // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
   exists(Content f | s = TSummaryReadTaint(f) | readStoreCandFwd2(f, config))
   or
   exists(Content f | s = TSummaryTaintStore(f) | readStoreCandFwd2(f, config))

Original file line number	Diff line number	Diff line change
`@@ -853,8 +853,7 @@ private predicate readStoreCandFwd2(Content f, Configuration config) {`
`853`	`853`	`}`
`854`	`854`
`855`	`855`	`private predicate summaryFwd2(Summary s, Configuration config) {`
`856`		`- s = TSummaryTaint()`
`857`		`- or`
	`856`	+ // No need for the `s = TSummaryTaint()` case as it is not used with `argumentFlowsThroughFwd2`.
`858`	`857`	`exists(Content f \| s = TSummaryReadTaint(f) \| readStoreCandFwd2(f, config))`
`859`	`858`	`or`
`860`	`859`	`exists(Content f \| s = TSummaryTaintStore(f) \| readStoreCandFwd2(f, config))`