Merge pull request #17259 from aschackmull/dataflow/remove-srcsink-grouping

Dataflow: Remove src/sink grouping feature
2025-12-16 16:53:25 +01:00 · 2024-08-20 14:42:33 +02:00
parent f0327732ef e73fc94354
commit 993bfee096
32 changed files with 19 additions and 318 deletions
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }

--- a/shared/dataflow/change-notes/2024-08-20-remove-srcsink-grouping.md
+++ b/shared/dataflow/change-notes/2024-08-20-remove-srcsink-grouping.md
@@ -0,0 +1,4 @@
+---
+category: deprecated
+---
+* The source/sink grouping feature of the data flow library has been removed. It was introduced primarily for debugging, but has not proven useful.
--- a/shared/dataflow/codeql/dataflow/DataFlow.qll
+++ b/shared/dataflow/codeql/dataflow/DataFlow.qll
@@ -424,12 +424,6 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
     */
    default FlowFeature getAFeature() { none() }

-    /** Holds if sources should be grouped in the result of `flowPath`. */
-    default predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-    /** Holds if sinks should be grouped in the result of `flowPath`. */
-    default predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
    /**
     * Holds if hidden nodes should be included in the data flow graph.
     *
@@ -546,12 +540,6 @@ module Configs<LocationSig Location, InputSig<Location> Lang> {
     */
    default FlowFeature getAFeature() { none() }

-    /** Holds if sources should be grouped in the result of `flowPath`. */
-    default predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-    /** Holds if sinks should be grouped in the result of `flowPath`. */
-    default predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
    /**
     * Holds if hidden nodes should be included in the data flow graph.
     *
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -117,12 +117,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     */
    FlowFeature getAFeature();

-    /** Holds if sources should be grouped in the result of `flowPath`. */
-    predicate sourceGrouping(Node source, string sourceGroup);
-
-    /** Holds if sinks should be grouped in the result of `flowPath`. */
-    predicate sinkGrouping(Node sink, string sinkGroup);
-
    /**
     * Holds if hidden nodes should be included in the data flow graph.
     *
@@ -3934,12 +3928,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
          node = sink.getNodeEx() and
          state = sink.getState()
        )
-      } or
-      TPathNodeSourceGroup(string sourceGroup) {
-        exists(PathNodeImpl source | sourceGroup = source.getSourceGroup())
-      } or
-      TPathNodeSinkGroup(string sinkGroup) {
-        exists(PathNodeSink sink | sinkGroup = sink.getSinkGroup())
      }

    /**
@@ -4153,21 +4141,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
        )
      }

-      string getSourceGroup() {
-        this.isSource(_) and
-        Config::sourceGrouping(this.getNodeEx().asNode(), result)
-      }
+      predicate isFlowSource() { this.isSource(_) }

-      predicate isFlowSource() {
-        this.isSource(_) and not exists(this.getSourceGroup())
-        or
-        this instanceof PathNodeSourceGroup
-      }
-
-      predicate isFlowSink() {
-        this = any(PathNodeSink sink | not exists(sink.getSinkGroup())) or
-        this instanceof PathNodeSinkGroup
-      }
+      predicate isFlowSink() { this instanceof PathNodeSink }

      private string ppType() {
        this instanceof PathNodeSink and result = ""
@@ -4217,7 +4193,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
    /** Holds if `n` can reach a sink. */
    private predicate directReach(PathNodeImpl n) {
      n instanceof PathNodeSink or
-      n instanceof PathNodeSinkGroup or
      directReach(n.getANonHiddenSuccessor(_))
    }

@@ -4284,11 +4259,19 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
      /** Holds if this node is a source. */
      final predicate isSource() { super.isSource(_) }

-      /** Holds if this node is a grouping of source nodes. */
-      final predicate isSourceGroup(string group) { this = TPathNodeSourceGroup(group) }
+      /**
+       * DEPRECATED: This functionality is no longer available.
+       *
+       * Holds if this node is a grouping of source nodes.
+       */
+      deprecated final predicate isSourceGroup(string group) { none() }

-      /** Holds if this node is a grouping of sink nodes. */
-      final predicate isSinkGroup(string group) { this = TPathNodeSinkGroup(group) }
+      /**
+       * DEPRECATED: This functionality is no longer available.
+       *
+       * Holds if this node is a grouping of sink nodes.
+       */
+      deprecated final predicate isSinkGroup(string group) { none() }
    }

    /**
@@ -4436,53 +4419,11 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {

      override FlowState getState() { result = state }

-      override PathNodeImpl getASuccessorImpl(string label) {
-        result = TPathNodeSinkGroup(this.getSinkGroup()) and label = ""
-      }
+      override PathNodeImpl getASuccessorImpl(string label) { none() }

      override predicate isSource(string model) {
        sourceNode(node, state) and sourceModel(node, model)
      }
-
-      string getSinkGroup() { Config::sinkGrouping(node.asNode(), result) }
-    }
-
-    private class PathNodeSourceGroup extends PathNodeImpl, TPathNodeSourceGroup {
-      string sourceGroup;
-
-      PathNodeSourceGroup() { this = TPathNodeSourceGroup(sourceGroup) }
-
-      override NodeEx getNodeEx() { none() }
-
-      override FlowState getState() { none() }
-
-      override PathNodeImpl getASuccessorImpl(string label) {
-        result.getSourceGroup() = sourceGroup and label = ""
-      }
-
-      override predicate isSource(string model) { none() }
-
-      override string toString() { result = sourceGroup }
-
-      override Location getLocation() { result.hasLocationInfo("", 0, 0, 0, 0) }
-    }
-
-    private class PathNodeSinkGroup extends PathNodeImpl, TPathNodeSinkGroup {
-      string sinkGroup;
-
-      PathNodeSinkGroup() { this = TPathNodeSinkGroup(sinkGroup) }
-
-      override NodeEx getNodeEx() { none() }
-
-      override FlowState getState() { none() }
-
-      override PathNodeImpl getASuccessorImpl(string label) { none() }
-
-      override predicate isSource(string model) { none() }
-
-      override string toString() { result = sinkGroup }
-
-      override Location getLocation() { result.hasLocationInfo("", 0, 0, 0, 0) }
    }

    private predicate pathNode(
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
@@ -290,14 +290,6 @@ deprecated private module Config implements FullStateConfigSig {

  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }

-  predicate sourceGrouping(Node source, string sourceGroup) {
-    any(Configuration config).sourceGrouping(source, sourceGroup)
-  }
-
-  predicate sinkGrouping(Node sink, string sinkGroup) {
-    any(Configuration config).sinkGrouping(sink, sinkGroup)
-  }
-
  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
 }