Update to account for changes on main

Author: smowton

go/ql/lib/semmle/go/dataflow/internal/DataFlowPrivate.qll

@@ -470,9 +470,11 @@ ContentApprox getContentApprox(Content c) { any() }
 /**
  * Holds if the the content `c` is a container.
  */
-predicate containerContent(ContentSet c) {
-  c instanceof ArrayContent or
-  c instanceof CollectionContent or
-  c instanceof MapKeyContent or
-  c instanceof MapValueContent
+predicate containerContentSet(ContentSet cs) {
+  exists(Content c | cs.asOneContent() = c |
+    c instanceof ArrayContent or
+    c instanceof CollectionContent or
+    c instanceof MapKeyContent or
+    c instanceof MapValueContent
+  )
 }

go/ql/lib/semmle/go/dataflow/internal/TaintTrackingUtil.qll

@@ -36,11 +36,11 @@ predicate localTaintStep(DataFlow::Node src, DataFlow::Node sink) {
   FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(src, sink, _)
   or
   // Treat container flow as taint for the local taint flow relation
-  exists(DataFlow::Content c | DataFlowPrivate::containerContent(c) |
-    DataFlowPrivate::readStep(src, c, sink) or
-    DataFlowPrivate::storeStep(src, c, sink) or
-    FlowSummaryImpl::Private::Steps::summaryGetterStep(src, c, sink, _) or
-    FlowSummaryImpl::Private::Steps::summarySetterStep(src, c, sink, _)
+  exists(DataFlow::ContentSet cs | DataFlowPrivate::containerContentSet(cs) |
+    DataFlowPrivate::readStep(src, cs, sink) or
+    DataFlowPrivate::storeStep(src, cs, sink) or
+    FlowSummaryImpl::Private::Steps::summaryGetterStep(src, cs, sink, _) or
+    FlowSummaryImpl::Private::Steps::summarySetterStep(src, cs, sink, _)
   )
 }
 

go/ql/test/library-tests/semmle/go/frameworks/serialization/test.ql

@@ -1,5 +1,5 @@
 import go
-import TestUtilities.InlineFlowTest
+import utils.test.InlineFlowTest
 
 string getArgString(DataFlow::Node src, DataFlow::Node sink) {
   exists(sink) and