C#: Remove uses of deprecated ControlFlowGraph module

hvitved · hvitved · commit e70f17f260a7 · 2019-06-17T10:23:23.000+02:00
diff --git a/csharp/ql/src/semmle/code/csharp/controlflow/ControlFlowElement.qll b/csharp/ql/src/semmle/code/csharp/controlflow/ControlFlowElement.qll
@@ -37,14 +37,14 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
    * Gets a first control flow node executed within this element.
    */
   Node getAControlFlowEntryNode() {
-    result = ControlFlowGraph::Internal::getAControlFlowEntryNode(this).getAControlFlowNode()
+    result = Internal::getAControlFlowEntryNode(this).getAControlFlowNode()
   }
 
   /**
    * Gets a potential last control flow node executed within this element.
    */
   Node getAControlFlowExitNode() {
-    result = ControlFlowGraph::Internal::getAControlFlowExitNode(this).getAControlFlowNode()
+    result = Internal::getAControlFlowExitNode(this).getAControlFlowNode()
   }
 
   /**
diff --git a/csharp/ql/test/library-tests/csharp8/NullCoalescingControlFlow.ql b/csharp/ql/test/library-tests/csharp8/NullCoalescingControlFlow.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.controlflow.ControlFlowGraph
 
 query predicate edges(ControlFlow::Node node1, ControlFlow::Node node2, string label, string value) {
   label = "semmle.label" and
diff --git a/csharp/ql/test/library-tests/csharp8/UsingControlFlow.ql b/csharp/ql/test/library-tests/csharp8/UsingControlFlow.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.controlflow.ControlFlowGraph
 
 query predicate edges(ControlFlow::Node node1, ControlFlow::Node node2, string label, string value) {
   label = "semmle.label" and
diff --git a/csharp/ql/test/library-tests/standalone/controlflow/cfg.ql b/csharp/ql/test/library-tests/standalone/controlflow/cfg.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.controlflow.ControlFlowGraph
 
 /**
  * A method call where the target is unknown.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import csharp`
`2`		`-import semmle.code.csharp.controlflow.ControlFlowGraph`
`3`	`2`
`4`	`3`	`query predicate edges(ControlFlow::Node node1, ControlFlow::Node node2, string label, string value) {`
`5`	`4`	`label = "semmle.label" and`