Merge pull request #4664 from hvitved/csharp/cfg/refactor

C#: Refactor CFG implementation

Author: hvitved

csharp/ql/src/semmle/code/csharp/commons/Assertions.qll

@@ -1,5 +1,6 @@
 /** Provides classes for assertions. */
 
+private import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl
 private import semmle.code.csharp.frameworks.system.Diagnostics
 private import semmle.code.csharp.frameworks.system.diagnostics.Contracts
 private import semmle.code.csharp.frameworks.test.VisualStudio
@@ -189,7 +190,7 @@ class Assertion extends MethodCall {
   deprecated private predicate immediatelyDominatesBlockSplit(BasicBlock succ) {
     // Only calculate dominance by explicit recursion for split nodes;
     // all other nodes can use regular CFG dominance
-    this instanceof ControlFlow::Internal::SplitControlFlowElement and
+    this instanceof SplitControlFlowElement and
     exists(BasicBlock bb | bb.getANode() = this.getAControlFlowNode() |
       succ = bb.getASuccessor() and
       forall(BasicBlock pred | pred = succ.getAPredecessor() and pred != bb |

csharp/ql/src/semmle/code/csharp/controlflow/ControlFlowElement.qll

@@ -6,6 +6,7 @@ private import ControlFlow
 private import ControlFlow::BasicBlocks
 private import SuccessorTypes
 private import semmle.code.csharp.Caching
+private import internal.ControlFlowGraphImpl
 
 /**
  * A program element that can possess control flow. That is, either a statement or
@@ -38,14 +39,14 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
    * Gets a first control flow node executed within this element.
    */
   Nodes::ElementNode getAControlFlowEntryNode() {
-    result = Internal::getAControlFlowEntryNode(this).getAControlFlowNode()
+    result = getAControlFlowEntryNode(this).getAControlFlowNode()
   }
 
   /**
    * Gets a potential last control flow node executed within this element.
    */
   Nodes::ElementNode getAControlFlowExitNode() {
-    result = Internal::getAControlFlowExitNode(this).getAControlFlowNode()
+    result = getAControlFlowExitNode(this).getAControlFlowNode()
   }
 
   /**
@@ -80,7 +81,7 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
   ) {
     // Only calculate dominance by explicit recursion for split nodes;
     // all other nodes can use regular CFG dominance
-    this instanceof ControlFlow::Internal::SplitControlFlowElement and
+    this instanceof SplitControlFlowElement and
     cb.getLastNode() = this.getAControlFlowNode() and
     succ = cb.getASuccessorByType(s)
   }