C#/Java/Ruby/Swift: Address review comments.

Author: michaelnebel

csharp/ql/lib/semmle/code/csharp/dataflow/ExternalFlow.qll

@@ -371,12 +371,12 @@ module CsvValidation {
   }
 
   private string getInvalidModelSubtype() {
-    exists(string pred, string row, int expect |
-      sourceModel(row) and expect = 9 and pred = "source"
+    exists(string pred, string row |
+      sourceModel(row) and pred = "source"
       or
-      sinkModel(row) and expect = 9 and pred = "sink"
+      sinkModel(row) and pred = "sink"
       or
-      summaryModel(row) and expect = 10 and pred = "summary"
+      summaryModel(row) and pred = "summary"
     |
       exists(string b |
         b = row.splitAt(";", 2) and

csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -115,8 +115,8 @@ predicate summaryElement(Callable c, string input, string output, string kind, b
 }
 
 /**
- * Holds if an external flow summary exists for `c` which means that there is no
- * flow through `c` and a flag `generated` stating whether the summary is autogenerated.
+ * Holds if a negative flow summary exists for `c`, which means that there is no
+ * flow through `c`. The flag `generated` states whether the summary is autogenerated.
  */
 predicate negativeSummaryElement(Callable c, boolean generated) {
   exists(string namespace, string type, string name, string signature, string provenance |

csharp/ql/src/utils/model-generator/internal/CaptureModels.qll

@@ -50,8 +50,6 @@ private string asSummaryModel(TargetApi api, string input, string output, string
 
 string asNegativeSummaryModel(TargetApi api) { result = asPartialNegativeModel(api) + "generated" }
 
-predicate partialNegativeModel = asPartialNegativeModel/1;
-
 /**
  * Gets the value summary model for `api` with `input` and `output`.
  */

csharp/ql/src/utils/model-generator/internal/CaptureSummaryFlow.qll

@@ -82,13 +82,9 @@ string captureFlow(TargetApi api) {
 
 /**
  * Gets the negative summary for `api`, if any.
- * A negative summary is generated, if there does not exist any positive flow that
- * shares the same summary prefix - otherwise these models will be indistinguishable.
+ * A negative summary is generated, if there does not exist any positive flow.
  */
 string captureNoFlow(TargetApi api) {
-  not exists(TargetApi other, string flow |
-    flow = captureFlow(other) and
-    partialNegativeModel(other) = partialNegativeModel(api)
-  ) and
+  not exists(captureFlow(api)) and
   result = asNegativeSummaryModel(api)
 }

go/ql/lib/semmle/go/dataflow/ExternalFlow.qll

@@ -299,12 +299,12 @@ module CsvValidation {
   }
 
   private string getInvalidModelSubtype() {
-    exists(string pred, string row, int expect |
-      sourceModel(row) and expect = 8 and pred = "source"
+    exists(string pred, string row |
+      sourceModel(row) and pred = "source"
       or
-      sinkModel(row) and expect = 8 and pred = "sink"
+      sinkModel(row) and pred = "sink"
       or
-      summaryModel(row) and expect = 9 and pred = "summary"
+      summaryModel(row) and pred = "summary"
     |
       exists(string b |
         b = row.splitAt(";", 2) and

java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll

@@ -639,12 +639,12 @@ module CsvValidation {
   }
 
   private string getInvalidModelSubtype() {
-    exists(string pred, string row, int expect |
-      sourceModel(row) and expect = 9 and pred = "source"
+    exists(string pred, string row |
+      sourceModel(row) and pred = "source"
       or
-      sinkModel(row) and expect = 9 and pred = "sink"
+      sinkModel(row) and pred = "sink"
       or
-      summaryModel(row) and expect = 10 and pred = "summary"
+      summaryModel(row) and pred = "summary"
     |
       exists(string b |
         b = row.splitAt(";", 2) and

java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -79,8 +79,8 @@ predicate summaryElement(Callable c, string input, string output, string kind, b
 }
 
 /**
- * Holds if an external flow summary exists for `c` which means that there is no
- * flow through `c` and a flag `generated` stating whether the summary is autogenerated.
+ * Holds if a negative flow summary exists for `c`, which means that there is no
+ * flow through `c`. The flag `generated` states whether the summary is autogenerated.
  */
 predicate negativeSummaryElement(Callable c, boolean generated) {
   exists(string namespace, string type, string name, string signature, string provenance |

java/ql/src/utils/model-generator/internal/CaptureModels.qll

@@ -50,8 +50,6 @@ private string asSummaryModel(TargetApi api, string input, string output, string
 
 string asNegativeSummaryModel(TargetApi api) { result = asPartialNegativeModel(api) + "generated" }
 
-predicate partialNegativeModel = asPartialNegativeModel/1;
-
 /**
  * Gets the value summary model for `api` with `input` and `output`.
  */

java/ql/src/utils/model-generator/internal/CaptureSummaryFlow.qll

@@ -74,13 +74,9 @@ string captureFlow(TargetApi api) {
 
 /**
  * Gets the negative summary for `api`, if any.
- * A negative summary is generated, if there does not exist any positive flow that
- * shares the same summary prefix - otherwise these models will be indistinguishable.
+ * A negative summary is generated, if there does not exist any positive flow.
  */
 string captureNoFlow(TargetApi api) {
-  not exists(TargetApi other, string flow |
-    flow = captureFlow(other) and
-    partialNegativeModel(other) = partialNegativeModel(api)
-  ) and
+  not exists(captureFlow(api)) and
   result = asNegativeSummaryModel(api)
 }

ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -60,8 +60,8 @@ predicate summaryElement(
 }
 
 /**
- * Holds if an external flow summary exists for `c` which means that there is no
- * flow through `c` and a flag `generated` stating whether the summary is autogenerated.
+ * Holds if a negative flow summary exists for `c`, which means that there is no
+ * flow through `c`. The flag `generated` states whether the summary is autogenerated.
  * Note. Negative flow summaries has not been implemented for ruby.
  */
 predicate negativeSummaryElement(FlowSummary::SummarizedCallable c, boolean generated) { none() }