Merge pull request #1785 from jbj/dataflow-recursion-prevention-shared

C++/C#/Java: Pyrameterize ConfigurationRecursionPrevention

java/ql/src/semmle/code/java/dataflow/DataFlow.qll

@@ -7,23 +7,4 @@ import java
 
 module DataFlow {
   import semmle.code.java.dataflow.internal.DataFlowImpl
-
-  /**
-   * This class exists to prevent mutual recursion between the user-overridden
-   * member predicates of `Configuration` and the rest of the data-flow library.
-   * Good performance cannot be guaranteed in the presence of such recursion, so
-   * it should be replaced by using more than one copy of the data flow library.
-   * Four copies are available: `DataFlow` through `DataFlow4`.
-   */
-  abstract private class ConfigurationRecursionPrevention extends Configuration {
-    bindingset[this]
-    ConfigurationRecursionPrevention() { any() }
-
-    override predicate hasFlow(Node source, Node sink) {
-      strictcount(Node n | this.isSource(n)) < 0 or
-      strictcount(Node n | this.isSink(n)) < 0 or
-      strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0 or
-      super.hasFlow(source, sink)
-    }
-  }
 }

java/ql/src/semmle/code/java/dataflow/DataFlow2.qll

@@ -7,23 +7,4 @@ import java
 
 module DataFlow2 {
   import semmle.code.java.dataflow.internal.DataFlowImpl2
-
-  /**
-   * This class exists to prevent mutual recursion between the user-overridden
-   * member predicates of `Configuration` and the rest of the data-flow library.
-   * Good performance cannot be guaranteed in the presence of such recursion, so
-   * it should be replaced by using more than one copy of the data flow library.
-   * Four copies are available: `DataFlow` through `DataFlow4`.
-   */
-  abstract private class ConfigurationRecursionPrevention extends Configuration {
-    bindingset[this]
-    ConfigurationRecursionPrevention() { any() }
-
-    override predicate hasFlow(Node source, Node sink) {
-      strictcount(Node n | this.isSource(n)) < 0 or
-      strictcount(Node n | this.isSink(n)) < 0 or
-      strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0 or
-      super.hasFlow(source, sink)
-    }
-  }
 }

java/ql/src/semmle/code/java/dataflow/DataFlow3.qll

@@ -7,23 +7,4 @@ import java
 
 module DataFlow3 {
   import semmle.code.java.dataflow.internal.DataFlowImpl3
-
-  /**
-   * This class exists to prevent mutual recursion between the user-overridden
-   * member predicates of `Configuration` and the rest of the data-flow library.
-   * Good performance cannot be guaranteed in the presence of such recursion, so
-   * it should be replaced by using more than one copy of the data flow library.
-   * Four copies are available: `DataFlow` through `DataFlow4`.
-   */
-  abstract private class ConfigurationRecursionPrevention extends Configuration {
-    bindingset[this]
-    ConfigurationRecursionPrevention() { any() }
-
-    override predicate hasFlow(Node source, Node sink) {
-      strictcount(Node n | this.isSource(n)) < 0 or
-      strictcount(Node n | this.isSink(n)) < 0 or
-      strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0 or
-      super.hasFlow(source, sink)
-    }
-  }
 }

java/ql/src/semmle/code/java/dataflow/DataFlow4.qll

@@ -7,23 +7,4 @@ import java
 
 module DataFlow4 {
   import semmle.code.java.dataflow.internal.DataFlowImpl4
-
-  /**
-   * This class exists to prevent mutual recursion between the user-overridden
-   * member predicates of `Configuration` and the rest of the data-flow library.
-   * Good performance cannot be guaranteed in the presence of such recursion, so
-   * it should be replaced by using more than one copy of the data flow library.
-   * Four copies are available: `DataFlow` through `DataFlow4`.
-   */
-  abstract private class ConfigurationRecursionPrevention extends Configuration {
-    bindingset[this]
-    ConfigurationRecursionPrevention() { any() }
-
-    override predicate hasFlow(Node source, Node sink) {
-      strictcount(Node n | this.isSource(n)) < 0 or
-      strictcount(Node n | this.isSink(n)) < 0 or
-      strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0 or
-      super.hasFlow(source, sink)
-    }
-  }
 }

java/ql/src/semmle/code/java/dataflow/DataFlow5.qll

@@ -7,23 +7,4 @@ import java
 
 module DataFlow5 {
   import semmle.code.java.dataflow.internal.DataFlowImpl5
-
-  /**
-   * This class exists to prevent mutual recursion between the user-overridden
-   * member predicates of `Configuration` and the rest of the data-flow library.
-   * Good performance cannot be guaranteed in the presence of such recursion, so
-   * it should be replaced by using more than one copy of the data flow library.
-   * Four copies are available: `DataFlow` through `DataFlow4`.
-   */
-  abstract private class ConfigurationRecursionPrevention extends Configuration {
-    bindingset[this]
-    ConfigurationRecursionPrevention() { any() }
-
-    override predicate hasFlow(Node source, Node sink) {
-      strictcount(Node n | this.isSource(n)) < 0 or
-      strictcount(Node n | this.isSink(n)) < 0 or
-      strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0 or
-      super.hasFlow(source, sink)
-    }
-  }
 }

java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll

@@ -121,6 +121,27 @@ abstract class Configuration extends string {
   deprecated predicate hasFlowBackward(Node source, Node sink) { hasFlow(source, sink) }
 }
 
+/**
+ * This class exists to prevent mutual recursion between the user-overridden
+ * member predicates of `Configuration` and the rest of the data-flow library.
+ * Good performance cannot be guaranteed in the presence of such recursion, so
+ * it should be replaced by using more than one copy of the data flow library.
+ */
+abstract private class ConfigurationRecursionPrevention extends Configuration {
+  bindingset[this]
+  ConfigurationRecursionPrevention() { any() }
+
+  override predicate hasFlow(Node source, Node sink) {
+    strictcount(Node n | this.isSource(n)) < 0
+    or
+    strictcount(Node n | this.isSink(n)) < 0
+    or
+    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
+    or
+    super.hasFlow(source, sink)
+  }
+}
+
 private predicate inBarrier(Node node, Configuration config) {
   config.isBarrierIn(node) and
   config.isSource(node)

java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll

@@ -121,6 +121,27 @@ abstract class Configuration extends string {
   deprecated predicate hasFlowBackward(Node source, Node sink) { hasFlow(source, sink) }
 }
 
+/**
+ * This class exists to prevent mutual recursion between the user-overridden
+ * member predicates of `Configuration` and the rest of the data-flow library.
+ * Good performance cannot be guaranteed in the presence of such recursion, so
+ * it should be replaced by using more than one copy of the data flow library.
+ */
+abstract private class ConfigurationRecursionPrevention extends Configuration {
+  bindingset[this]
+  ConfigurationRecursionPrevention() { any() }
+
+  override predicate hasFlow(Node source, Node sink) {
+    strictcount(Node n | this.isSource(n)) < 0
+    or
+    strictcount(Node n | this.isSink(n)) < 0
+    or
+    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
+    or
+    super.hasFlow(source, sink)
+  }
+}
+
 private predicate inBarrier(Node node, Configuration config) {
   config.isBarrierIn(node) and
   config.isSource(node)

java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll

@@ -121,6 +121,27 @@ abstract class Configuration extends string {
   deprecated predicate hasFlowBackward(Node source, Node sink) { hasFlow(source, sink) }
 }
 
+/**
+ * This class exists to prevent mutual recursion between the user-overridden
+ * member predicates of `Configuration` and the rest of the data-flow library.
+ * Good performance cannot be guaranteed in the presence of such recursion, so
+ * it should be replaced by using more than one copy of the data flow library.
+ */
+abstract private class ConfigurationRecursionPrevention extends Configuration {
+  bindingset[this]
+  ConfigurationRecursionPrevention() { any() }
+
+  override predicate hasFlow(Node source, Node sink) {
+    strictcount(Node n | this.isSource(n)) < 0
+    or
+    strictcount(Node n | this.isSink(n)) < 0
+    or
+    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
+    or
+    super.hasFlow(source, sink)
+  }
+}
+
 private predicate inBarrier(Node node, Configuration config) {
   config.isBarrierIn(node) and
   config.isSource(node)

java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll

@@ -121,6 +121,27 @@ abstract class Configuration extends string {
   deprecated predicate hasFlowBackward(Node source, Node sink) { hasFlow(source, sink) }
 }
 
+/**
+ * This class exists to prevent mutual recursion between the user-overridden
+ * member predicates of `Configuration` and the rest of the data-flow library.
+ * Good performance cannot be guaranteed in the presence of such recursion, so
+ * it should be replaced by using more than one copy of the data flow library.
+ */
+abstract private class ConfigurationRecursionPrevention extends Configuration {
+  bindingset[this]
+  ConfigurationRecursionPrevention() { any() }
+
+  override predicate hasFlow(Node source, Node sink) {
+    strictcount(Node n | this.isSource(n)) < 0
+    or
+    strictcount(Node n | this.isSink(n)) < 0
+    or
+    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
+    or
+    super.hasFlow(source, sink)
+  }
+}
+
 private predicate inBarrier(Node node, Configuration config) {
   config.isBarrierIn(node) and
   config.isSource(node)

java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll

@@ -121,6 +121,27 @@ abstract class Configuration extends string {
   deprecated predicate hasFlowBackward(Node source, Node sink) { hasFlow(source, sink) }
 }
 
+/**
+ * This class exists to prevent mutual recursion between the user-overridden
+ * member predicates of `Configuration` and the rest of the data-flow library.
+ * Good performance cannot be guaranteed in the presence of such recursion, so
+ * it should be replaced by using more than one copy of the data flow library.
+ */
+abstract private class ConfigurationRecursionPrevention extends Configuration {
+  bindingset[this]
+  ConfigurationRecursionPrevention() { any() }
+
+  override predicate hasFlow(Node source, Node sink) {
+    strictcount(Node n | this.isSource(n)) < 0
+    or
+    strictcount(Node n | this.isSink(n)) < 0
+    or
+    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
+    or
+    super.hasFlow(source, sink)
+  }
+}
+
 private predicate inBarrier(Node node, Configuration config) {
   config.isBarrierIn(node) and
   config.isSource(node)