C#/Java: Move containerContent to DataFlowPrivate.

Author: michaelnebel

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

@@ -2026,3 +2026,8 @@ abstract class SyntheticField extends string {
   /** Gets the type of this synthetic field. */
   Type getType() { result instanceof ObjectType }
 }
+
+/**
+ * Holds if the the content `c` is a container.
+ */
+predicate containerContent(DataFlow::Content c) { c instanceof DataFlow::ElementContent }

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

@@ -252,8 +252,3 @@ class ElementContent extends Content, TElementContent {
 
   override Location getLocation() { result instanceof EmptyLocation }
 }
-
-/**
- * Holds if the the content `c` is a container.
- */
-predicate containerContent(DataFlow::Content c) { c instanceof DataFlow::ElementContent }

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

@@ -14,7 +14,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
       else any()
   )
   or
-  exists(DataFlow::Content f | storeStep(node1, f, node2) | DataFlow::containerContent(f))
+  exists(DataFlow::Content f | storeStep(node1, f, node2) | containerContent(f))
 }
 
 /**
@@ -24,7 +24,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
 predicate isRelevantContent(DataFlow::Content c) {
   isRelevantType(c.(DataFlow::FieldContent).getField().getType()) or
   isRelevantType(c.(DataFlow::SyntheticFieldContent).getField().getType()) or
-  DataFlow::containerContent(c)
+  containerContent(c)
 }
 
 /**

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

@@ -416,3 +416,13 @@ private class MyConsistencyConfiguration extends Consistency::ConsistencyConfigu
     n.getType() instanceof ImmutableType or n instanceof ImplicitVarargsArray
   }
 }
+
+/**
+ * Holds if the the content `c` is a container.
+ */
+predicate containerContent(Content c) {
+  c instanceof ArrayContent or
+  c instanceof CollectionContent or
+  c instanceof MapKeyContent or
+  c instanceof MapValueContent
+}

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

@@ -256,16 +256,6 @@ class SyntheticFieldContent extends Content, TSyntheticFieldContent {
   override string toString() { result = s.toString() }
 }
 
-/**
- * Holds if the the content `c` is a container.
- */
-predicate containerContent(Content c) {
-  c instanceof ArrayContent or
-  c instanceof CollectionContent or
-  c instanceof MapKeyContent or
-  c instanceof MapValueContent
-}
-
 /**
  * A guard that validates some expression.
  *

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

@@ -54,7 +54,7 @@ private module Cached {
     FlowSummaryImpl::Private::Steps::summaryThroughStep(src, sink, false)
     or
     // Treat container flow as taint for the local taint flow relation
-    exists(DataFlow::Content c | DataFlow::containerContent(c) |
+    exists(DataFlow::Content c | containerContent(c) |
       readStep(src, c, sink) or
       storeStep(src, c, sink) or
       FlowSummaryImpl::Private::Steps::summaryGetterStep(src, c, sink) or
@@ -80,7 +80,7 @@ private module Cached {
       not sink.getTypeBound() instanceof BoxedType and
       not sink.getTypeBound() instanceof NumberType and
       (
-        DataFlow::containerContent(f)
+        containerContent(f)
         or
         f instanceof TaintInheritingContent
       )

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

@@ -14,7 +14,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
       else any()
   )
   or
-  exists(DataFlow::Content f | storeStep(node1, f, node2) | DataFlow::containerContent(f))
+  exists(DataFlow::Content f | storeStep(node1, f, node2) | containerContent(f))
 }
 
 /**
@@ -24,7 +24,7 @@ predicate isRelevantTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
 predicate isRelevantContent(DataFlow::Content c) {
   isRelevantType(c.(DataFlow::FieldContent).getField().getType()) or
   isRelevantType(c.(DataFlow::SyntheticFieldContent).getField().getType()) or
-  DataFlow::containerContent(c)
+  containerContent(c)
 }
 
 /**