C#: Rename remaining references to ControlFlow::Nodes.

github · aschackmull · Apr 21, 2026 · Mar 5, 2026 · Mar 5, 2026 · Mar 3, 2026
commit 13a4141cc66e9681ff0d8be2f72b37fdb21d19c5
@@ -70,7 +70,7 @@ private module Input implements InputSig<Location, CsharpDataFlow> {
           init.getInitializer().getNumberOfChildren() > 1
         )
       or
-      exists(ControlFlow::Nodes::ElementNode cfn, ControlFlow::Nodes::Split split |
+      exists(ControlFlowNodes::ElementNode cfn, ControlFlowNodes::Split split |
         exists(arg.asExprAtNode(cfn))
       |
         split = cfn.getASplit() and

@@ -42,7 +42,7 @@ class ControlFlowElement extends ControlFlowElementOrCallable, @control_flow_ele
    * several `ControlFlowNode`s, for example to represent the continuation
    * flow in a `try/catch/finally` construction.
    */
-  Nodes::ElementNode getAControlFlowNode() { result.getAstNode() = this }
+  ControlFlowNodes::ElementNode getAControlFlowNode() { result.getAstNode() = this }
 
   /** Gets the control flow node for this element. */
   ControlFlowNode getControlFlowNode() { result.getAstNode() = this }
@@ -53,14 +53,14 @@ class ControlFlowElement extends ControlFlowElementOrCallable, @control_flow_ele
   /**
    * Gets a first control flow node executed within this element.
    */
-  Nodes::ElementNode getAControlFlowEntryNode() {
+  ControlFlowNodes::ElementNode getAControlFlowEntryNode() {
     result = Impl::getAControlFlowEntryNode(this).(ControlFlowElement).getAControlFlowNode()
   }
 
   /**
    * Gets a potential last control flow node executed within this element.
    */
-  Nodes::ElementNode getAControlFlowExitNode() {
+  ControlFlowNodes::ElementNode getAControlFlowExitNode() {
     result = Impl::getAControlFlowExitNode(this).(ControlFlowElement).getAControlFlowNode()
   }
 

@@ -255,42 +255,6 @@ module ControlFlow {
     Callable getEnclosingCallable() { result = this.getScope() }
   }
 
-  /** Provides different types of control flow nodes. */
-  module Nodes {
-    /**
-     * A node for a control flow element, that is, an expression or a statement.
-     *
-     * Each control flow element maps to zero or more `ElementNode`s: zero when
-     * the element is in unreachable (dead) code, and multiple when there are
-     * different splits for the element.
-     */
-    class ElementNode extends Node instanceof Impl::AstCfgNode {
-      /** Gets a comma-separated list of strings for each split in this node, if any. */
-      final string getSplitsString() { result = super.getSplitsString() }
-
-      /** Gets a split for this control flow node, if any. */
-      final Split getASplit() { result = super.getASplit() }
-    }
-
-    /** A control-flow node for an expression. */
-    class ExprNode extends ElementNode {
-      Expr e;
-
-      ExprNode() { e = unique(Expr e_ | e_ = this.asExpr() | e_) }
-
-      /** Gets the expression that this control-flow node belongs to. */
-      Expr getExpr() { result = e }
-
-      /** Gets the value of this expression node, if any. */
-      string getValue() { result = e.getValue() }
-
-      /** Gets the type of this expression node. */
-      Type getType() { result = e.getType() }
-    }
-
-    class Split = Splitting::Split;
-  }
-
   class BasicBlock = BBs::BasicBlock;
 
   /** Provides different types of basic blocks. */
@@ -308,3 +272,42 @@ module ControlFlow {
     class ConditionBlock = BBs::ConditionBlock;
   }
 }
+
+/** Provides different types of control flow nodes. */
+module ControlFlowNodes {
+  private import internal.ControlFlowGraphImpl as Impl
+  private import internal.Splitting as Splitting
+
+  /**
+   * A node for a control flow element, that is, an expression or a statement.
+   *
+   * Each control flow element maps to zero or more `ElementNode`s: zero when
+   * the element is in unreachable (dead) code, and multiple when there are
+   * different splits for the element.
+   */
+  class ElementNode extends ControlFlowNode instanceof Impl::AstCfgNode {
+    /** Gets a comma-separated list of strings for each split in this node, if any. */
+    final string getSplitsString() { result = super.getSplitsString() }
+
+    /** Gets a split for this control flow node, if any. */
+    final Split getASplit() { result = super.getASplit() }
+  }
+
+  /** A control-flow node for an expression. */
+  class ExprNode extends ElementNode {
+    Expr e;
+
+    ExprNode() { e = unique(Expr e_ | e_ = this.asExpr() | e_) }
+
+    /** Gets the expression that this control-flow node belongs to. */
+    Expr getExpr() { result = e }
+
+    /** Gets the value of this expression node, if any. */
+    string getValue() { result = e.getValue() }
+
+    /** Gets the type of this expression node. */
+    Type getType() { result = e.getType() }
+  }
+
+  class Split = Splitting::Split;
+}
@@ -322,7 +322,7 @@ class Guard extends Guards::Guard {
    * In case `cfn` or `sub` access an SSA variable in their left-most qualifier, then
    * so must the other (accessing the same SSA variable).
    */
-  predicate controlsNode(ControlFlow::Nodes::ElementNode cfn, AccessOrCallExpr sub, GuardValue v) {
+  predicate controlsNode(ControlFlowNodes::ElementNode cfn, AccessOrCallExpr sub, GuardValue v) {
     isGuardedByNode(cfn, this, sub, v)
   }
 
@@ -332,7 +332,7 @@ class Guard extends Guards::Guard {
    * Note: This predicate is inlined.
    */
   pragma[inline]
-  predicate controlsNode(ControlFlow::Nodes::ElementNode cfn, GuardValue v) {
+  predicate controlsNode(ControlFlowNodes::ElementNode cfn, GuardValue v) {
     guardControls(this, cfn.getBasicBlock(), v)
   }
 
@@ -729,7 +729,7 @@ class GuardedExpr extends AccessOrCallExpr {
  * In the example above, the node for `x.ToString()` is null-guarded in the
  * split `b == true`, but not in the split `b == false`.
  */
-class GuardedControlFlowNode extends ControlFlow::Nodes::ElementNode {
+class GuardedControlFlowNode extends ControlFlowNodes::ElementNode {
   private Guard g;
   private AccessOrCallExpr sub0;
   private GuardValue v0;
@@ -785,7 +785,7 @@ class GuardedDataFlowNode extends DataFlow::ExprNode {
   private GuardValue v0;
 
   GuardedDataFlowNode() {
-    exists(ControlFlow::Nodes::ElementNode cfn | exists(this.getExprAtNode(cfn)) |
+    exists(ControlFlowNodes::ElementNode cfn | exists(this.getExprAtNode(cfn)) |
       g.controlsNode(cfn, sub0, v0)
     )
   }
@@ -1179,7 +1179,7 @@ module Internal {
 
     cached
     predicate isGuardedByNode(
-      ControlFlow::Nodes::ElementNode guarded, Guard g, AccessOrCallExpr sub, GuardValue v
+      ControlFlowNodes::ElementNode guarded, Guard g, AccessOrCallExpr sub, GuardValue v
     ) {
       nodeIsGuardedBySameSubExpr(guarded, _, _, g, sub, v) and
       forall(ControlFlowNode subCfn, Ssa::Definition def |

@@ -486,7 +486,7 @@ module Ssa {
      * `M2` via the call on line 6.
      */
     deprecated final predicate isCapturedVariableDefinitionFlowIn(
-      ImplicitEntryDefinition def, ControlFlow::Nodes::ElementNode c, boolean additionalCalls
+      ImplicitEntryDefinition def, ControlFlowNodes::ElementNode c, boolean additionalCalls
     ) {
       none()
     }

@@ -34,13 +34,13 @@ predicate strictlyNegativeExpr(Expr e) {
 }
 
 /** Holds if `e` can be positive and cannot be negative. */
-predicate positive(ControlFlow::Nodes::ExprNode e) { Common::positive(e) }
+predicate positive(ControlFlowNodes::ExprNode e) { Common::positive(e) }
 
 /** Holds if `e` can be negative and cannot be positive. */
-predicate negative(ControlFlow::Nodes::ExprNode e) { Common::negative(e) }
+predicate negative(ControlFlowNodes::ExprNode e) { Common::negative(e) }
 
 /** Holds if `e` is strictly positive. */
-predicate strictlyPositive(ControlFlow::Nodes::ExprNode e) { Common::strictlyPositive(e) }
+predicate strictlyPositive(ControlFlowNodes::ExprNode e) { Common::strictlyPositive(e) }
 
 /** Holds if `e` is strictly negative. */
-predicate strictlyNegative(ControlFlow::Nodes::ExprNode e) { Common::strictlyNegative(e) }
+predicate strictlyNegative(ControlFlowNodes::ExprNode e) { Common::strictlyNegative(e) }
@@ -73,11 +73,11 @@ private module Cached {
 
   cached
   newtype TDataFlowCall =
-    TNonDelegateCall(ControlFlow::Nodes::ElementNode cfn, DispatchCall dc) {
+    TNonDelegateCall(ControlFlowNodes::ElementNode cfn, DispatchCall dc) {
       DataFlowImplCommon::forceCachingInSameStage() and
       cfn.asExpr() = dc.getCall()
     } or
-    TExplicitDelegateLikeCall(ControlFlow::Nodes::ElementNode cfn, DelegateLikeCall dc) {
+    TExplicitDelegateLikeCall(ControlFlowNodes::ElementNode cfn, DelegateLikeCall dc) {
       cfn.asExpr() = dc
     } or
     TSummaryCall(FlowSummary::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver) {
@@ -210,7 +210,7 @@ class DataFlowCallable extends TDataFlowCallable {
   }
 
   pragma[nomagic]
-  private ControlFlow::Nodes::ElementNode getAMultiBodyEntryNode(ControlFlow::BasicBlock bb, int i) {
+  private ControlFlowNodes::ElementNode getAMultiBodyEntryNode(ControlFlow::BasicBlock bb, int i) {
     this.isMultiBodied() and
     exists(ControlFlowElement body, Location l |
       body = this.asCallable(l).getBody() or
@@ -223,14 +223,14 @@ class DataFlowCallable extends TDataFlowCallable {
   }
 
   pragma[nomagic]
-  private ControlFlow::Nodes::ElementNode getAMultiBodyControlFlowNodePred() {
+  private ControlFlowNodes::ElementNode getAMultiBodyControlFlowNodePred() {
     result = this.getAMultiBodyEntryNode(_, _).getAPredecessor()
     or
     result = this.getAMultiBodyControlFlowNodePred().getAPredecessor()
   }
 
   pragma[nomagic]
-  private ControlFlow::Nodes::ElementNode getAMultiBodyControlFlowNodeSuccSameBasicBlock() {
+  private ControlFlowNodes::ElementNode getAMultiBodyControlFlowNodeSuccSameBasicBlock() {
     exists(ControlFlow::BasicBlock bb, int i, int j |
       exists(this.getAMultiBodyEntryNode(bb, i)) and
       result = bb.getNode(j) and
@@ -246,7 +246,7 @@ class DataFlowCallable extends TDataFlowCallable {
   }
 
   pragma[inline]
-  private ControlFlow::Nodes::ElementNode getAMultiBodyControlFlowNode() {
+  private ControlFlowNodes::ElementNode getAMultiBodyControlFlowNode() {
     result =
       [
         this.getAMultiBodyEntryNode(_, _), this.getAMultiBodyControlFlowNodePred(),
@@ -307,7 +307,7 @@ abstract class DataFlowCall extends TDataFlowCall {
   abstract DataFlowCallable getARuntimeTarget();
 
   /** Gets the control flow node where this call happens, if any. */
-  abstract ControlFlow::Nodes::ElementNode getControlFlowNode();
+  abstract ControlFlowNodes::ElementNode getControlFlowNode();
 
   /** Gets the data flow node corresponding to this call, if any. */
   abstract DataFlow::Node getNode();
@@ -363,7 +363,7 @@ private predicate folderDist(Folder f1, Folder f2, int i) =
 
 /** A non-delegate C# call relevant for data flow. */
 class NonDelegateDataFlowCall extends DataFlowCall, TNonDelegateCall {
-  private ControlFlow::Nodes::ElementNode cfn;
+  private ControlFlowNodes::ElementNode cfn;
   private DispatchCall dc;
 
   NonDelegateDataFlowCall() { this = TNonDelegateCall(cfn, dc) }
@@ -436,7 +436,7 @@ class NonDelegateDataFlowCall extends DataFlowCall, TNonDelegateCall {
     not dc.isReflection()
   }
 
-  override ControlFlow::Nodes::ElementNode getControlFlowNode() { result = cfn }
+  override ControlFlowNodes::ElementNode getControlFlowNode() { result = cfn }
 
   override DataFlow::ExprNode getNode() { result.getControlFlowNode() = cfn }
 
@@ -452,7 +452,7 @@ abstract class DelegateDataFlowCall extends DataFlowCall { }
 
 /** An explicit delegate or function pointer call relevant for data flow. */
 class ExplicitDelegateLikeDataFlowCall extends DelegateDataFlowCall, TExplicitDelegateLikeCall {
-  private ControlFlow::Nodes::ElementNode cfn;
+  private ControlFlowNodes::ElementNode cfn;
   private DelegateLikeCall dc;
 
   ExplicitDelegateLikeDataFlowCall() { this = TExplicitDelegateLikeCall(cfn, dc) }
@@ -464,7 +464,7 @@ class ExplicitDelegateLikeDataFlowCall extends DelegateDataFlowCall, TExplicitDe
     none() // handled by the shared library
   }
 
-  override ControlFlow::Nodes::ElementNode getControlFlowNode() { result = cfn }
+  override ControlFlowNodes::ElementNode getControlFlowNode() { result = cfn }
 
   override DataFlow::ExprNode getNode() { result.getControlFlowNode() = cfn }
 
@@ -495,7 +495,7 @@ class SummaryCall extends DelegateDataFlowCall, TSummaryCall {
     none() // handled by the shared library
   }
 
-  override ControlFlow::Nodes::ElementNode getControlFlowNode() { none() }
+  override ControlFlowNodes::ElementNode getControlFlowNode() { none() }
 
   override DataFlow::Node getNode() { none() }