C#: Update some references to ControlFlow::Nodes.

Author: aschackmull

csharp/ql/lib/semmle/code/csharp/Callable.qll

@@ -157,10 +157,10 @@ class Callable extends Parameterizable, ControlFlowElementOrCallable, @callable
   final predicate hasExpressionBody() { exists(this.getExpressionBody()) }
 
   /** Gets the entry point in the control graph for this callable. */
-  ControlFlow::Nodes::EntryNode getEntryPoint() { result.getCallable() = this }
+  ControlFlow::EntryNode getEntryPoint() { result.getEnclosingCallable() = this }
 
   /** Gets the exit point in the control graph for this callable. */
-  ControlFlow::Nodes::ExitNode getExitPoint() { result.getCallable() = this }
+  ControlFlow::ExitNode getExitPoint() { result.getEnclosingCallable() = this }
 
   /**
    * Gets the enclosing callable of this callable, if any.

csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowGraph.qll

@@ -234,37 +234,29 @@ module ControlFlow {
     final Callable getEnclosingCallable() { result = Impl::getNodeCfgScope(this) }
   }
 
-  /** Provides different types of control flow nodes. */
-  module Nodes {
-    /** A node for a callable entry point. */
-    class EntryNode extends Node instanceof Impl::EntryNode {
-      /** Gets the callable that this entry applies to. */
-      Callable getCallable() { result = this.getScope() }
-
-      override BasicBlocks::EntryBlock getBasicBlock() { result = Node.super.getBasicBlock() }
-    }
-
-    /** A node for a callable exit point, annotated with the type of exit. */
-    class AnnotatedExitNode extends Node instanceof Impl::AnnotatedExitNode {
-      /** Gets the callable that this exit applies to. */
-      Callable getCallable() { result = this.getScope() }
-
-      override BasicBlocks::AnnotatedExitBlock getBasicBlock() {
-        result = Node.super.getBasicBlock()
-      }
-    }
+  /** A node for a callable entry point. */
+  class EntryNode extends Node instanceof Impl::EntryNode {
+    /** Gets the callable that this entry applies to. */
+    Callable getEnclosingCallable() { result = this.getScope() }
+  }
 
-    /** A control flow node indicating normal termination of a callable. */
-    class NormalExitNode extends AnnotatedExitNode instanceof Impl::NormalExitNode { }
+  /** A node for a callable exit point, annotated with the type of exit. */
+  class AnnotatedExitNode extends Node instanceof Impl::AnnotatedExitNode {
+    /** Gets the callable that this exit applies to. */
+    Callable getEnclosingCallable() { result = this.getScope() }
+  }
 
-    /** A node for a callable exit point. */
-    class ExitNode extends Node instanceof Impl::ExitNode {
-      /** Gets the callable that this exit applies to. */
-      Callable getCallable() { result = this.getScope() }
+  /** A control flow node indicating normal termination of a callable. */
+  class NormalExitNode extends AnnotatedExitNode instanceof Impl::NormalExitNode { }
 
-      override BasicBlocks::ExitBlock getBasicBlock() { result = Node.super.getBasicBlock() }
-    }
+  /** A node for a callable exit point. */
+  class ExitNode extends Node instanceof Impl::ExitNode {
+    /** Gets the callable that this exit applies to. */
+    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.
      *

csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll

@@ -20,7 +20,7 @@ private module GuardsInput implements
 {
   private import csharp as CS
 
-  class NormalExitNode = ControlFlow::Nodes::NormalExitNode;
+  class NormalExitNode = ControlFlow::NormalExitNode;
 
   class AstNode = ControlFlowElement;
 

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

@@ -28,8 +28,8 @@ newtype TReturnKind =
 private predicate hasMultipleSourceLocations(Callable c) { strictcount(getASourceLocation(c)) > 1 }
 
 private predicate objectInitEntry(ObjectInitMethod m, ControlFlowElement first) {
-  exists(ControlFlow::Nodes::EntryNode en |
-    en.getCallable() = m and first.getControlFlowNode() = en.getASuccessor()
+  exists(ControlFlow::EntryNode en |
+    en.getEnclosingCallable() = m and first.getControlFlowNode() = en.getASuccessor()
   )
 }
 

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

@@ -187,11 +187,11 @@ private module SourceVariableImpl {
    * ```
    */
   predicate outRefExitRead(ControlFlow::BasicBlock bb, int i, LocalScopeSourceVariable v) {
-    exists(ControlFlow::Nodes::NormalExitNode exit |
+    exists(ControlFlow::NormalExitNode exit |
       exists(LocalScopeVariable lsv |
         lsv = v.getAssignable() and
         bb.getNode(i) = exit and
-        exit.getCallable() = lsv.getCallable()
+        exit.getEnclosingCallable() = lsv.getCallable()
       |
         lsv.(Parameter).isOutOrRef()
         or