C#: Move the isRelevantTaintStep and isRelevantContent into the shared utils.

Author: michaelnebel

csharp/ql/src/utils/model-generator/ModelGeneratorUtils.qll

@@ -1,5 +1,25 @@
 import ModelGeneratorUtilsSpecific
 
+predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
+  exists(DataFlow::Content f |
+    readStep(node1, f, node2) and
+    if f instanceof DataFlow::FieldContent
+    then isRelevantType(f.(DataFlow::FieldContent).getField().getType())
+    else
+      if f instanceof DataFlow::SyntheticFieldContent
+      then isRelevantType(f.(DataFlow::SyntheticFieldContent).getField().getType())
+      else any()
+  )
+  or
+  exists(DataFlow::Content f | storeStep(node1, f, node2) | DataFlow::containerContent(f))
+}
+
+predicate isRelevantContent(DataFlow::Content f) {
+  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
+  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
+  DataFlow::containerContent(f)
+}
+
 bindingset[input, output, kind]
 string asSummaryModel(TargetAPI api, string input, string output, string kind) {
   result =

csharp/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll

@@ -1,6 +1,6 @@
 import csharp
+import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 private import semmle.code.csharp.commons.Util
-private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 private import semmle.code.csharp.dataflow.internal.DataFlowImplCommon
 private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
 
@@ -55,26 +55,6 @@ string asPartialModel(TargetAPI api) {
 
 predicate isRelevantType(Type t) { not t instanceof Enum }
 
-predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-  exists(DataFlow::Content f |
-    readStep(node1, f, node2) and
-    if f instanceof DataFlow::FieldContent
-    then isRelevantType(f.(DataFlow::FieldContent).getField().getType())
-    else
-      if f instanceof DataFlow::SyntheticFieldContent
-      then isRelevantType(f.(DataFlow::SyntheticFieldContent).getField().getType())
-      else any()
-  )
-  or
-  exists(DataFlow::Content f | storeStep(node1, f, node2) | DataFlow::containerContent(f))
-}
-
-predicate isRelevantContent(DataFlow::Content f) {
-  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
-  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
-  DataFlow::containerContent(f)
-}
-
 private predicate isPrimitiveTypeUsedForBulkData(Type t) {
   t.getName().regexpMatch("byte|char|Byte|Char")
 }

java/ql/src/utils/model-generator/ModelGeneratorUtils.qll

@@ -1,5 +1,25 @@
 import ModelGeneratorUtilsSpecific
 
+predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
+  exists(DataFlow::Content f |
+    readStep(node1, f, node2) and
+    if f instanceof DataFlow::FieldContent
+    then isRelevantType(f.(DataFlow::FieldContent).getField().getType())
+    else
+      if f instanceof DataFlow::SyntheticFieldContent
+      then isRelevantType(f.(DataFlow::SyntheticFieldContent).getField().getType())
+      else any()
+  )
+  or
+  exists(DataFlow::Content f | storeStep(node1, f, node2) | DataFlow::containerContent(f))
+}
+
+predicate isRelevantContent(DataFlow::Content f) {
+  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
+  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
+  DataFlow::containerContent(f)
+}
+
 bindingset[input, output, kind]
 string asSummaryModel(TargetApi api, string input, string output, string kind) {
   result =

java/ql/src/utils/model-generator/ModelGeneratorUtilsSpecific.qll

@@ -1,9 +1,9 @@
 import java
+import semmle.code.java.dataflow.internal.DataFlowPrivate
+import semmle.code.java.dataflow.DataFlow
 private import semmle.code.java.dataflow.ExternalFlow
 private import semmle.code.java.dataflow.internal.ContainerFlow
 private import semmle.code.java.dataflow.internal.DataFlowImplCommon
-private import semmle.code.java.dataflow.DataFlow
-private import semmle.code.java.dataflow.internal.DataFlowPrivate
 
 Method superImpl(Method m) {
   result = m.getAnOverride() and
@@ -111,26 +111,6 @@ predicate isRelevantType(Type t) {
   )
 }
 
-predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-  exists(DataFlow::Content f |
-    readStep(node1, f, node2) and
-    if f instanceof DataFlow::FieldContent
-    then isRelevantType(f.(DataFlow::FieldContent).getField().getType())
-    else
-      if f instanceof DataFlow::SyntheticFieldContent
-      then isRelevantType(f.(DataFlow::SyntheticFieldContent).getField().getType())
-      else any()
-  )
-  or
-  exists(DataFlow::Content f | storeStep(node1, f, node2) | DataFlow::containerContent(f))
-}
-
-predicate isRelevantContent(DataFlow::Content f) {
-  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
-  isRelevantType(f.(DataFlow::FieldContent).getField().getType()) or
-  DataFlow::containerContent(f)
-}
-
 private string parameterAccess(Parameter p) {
   if
     p.getType() instanceof Array and