C#/Cfg: Some simple review fixes.

Author: aschackmull

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

@@ -38,7 +38,7 @@ class ControlFlowElement extends ControlFlowElementOrCallable, @control_flow_ele
    */
   ControlFlowNodes::ElementNode getAControlFlowNode() { result = this.getControlFlowNode() }
 
-  /** Gets the control flow node for this element. */
+  /** Gets the control flow node for this element, if any. */
   ControlFlowNode getControlFlowNode() { result.injects(this) }
 
   /** Gets the basic block in which this element occurs. */

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

@@ -277,11 +277,12 @@ private module Initializers {
    */
   Expr initializedStaticMemberOrder(Constructor staticCtor, int i) {
     result =
-      rank[i + 1](Expr init, Location l |
+      rank[i + 1](Expr init, Location l, string filepath, int startline, int startcolumn |
         staticMemberInitializer(staticCtor, init) and
-        l = init.getLocation()
+        l = init.getLocation() and
+        l.hasLocationInfo(filepath, startline, startcolumn, _, _)
       |
-        init order by l.getStartLine(), l.getStartColumn(), l.getFile().getAbsolutePath()
+        init order by startline, startcolumn, filepath
       )
   }
 
@@ -292,12 +293,13 @@ private module Initializers {
   AssignExpr initializedInstanceMemberOrder(ObjectInitMethod obinit, CompilationExt comp, int i) {
     obinit.initializes(result) and
     result =
-      rank[i + 1](AssignExpr ae0, Location l |
+      rank[i + 1](AssignExpr ae0, Location l, string filepath, int startline, int startcolumn |
         obinit.initializes(ae0) and
         l = ae0.getLocation() and
+        l.hasLocationInfo(filepath, startline, startcolumn, _, _) and
         getCompilation(l.getFile()) = comp
       |
-        ae0 order by l.getStartLine(), l.getStartColumn(), l.getFile().getAbsolutePath()
+        ae0 order by startline, startcolumn, filepath
       )
   }
 

csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll

@@ -21,10 +21,8 @@
 
 import csharp
 private import semmle.code.csharp.commons.Assertions
-private import semmle.code.csharp.commons.Constants
 private import semmle.code.csharp.frameworks.System
 private import NonReturning
-private import SuccessorType
 
 private class Overflowable extends UnaryOperation {
   Overflowable() {

shared/controlflow/codeql/controlflow/ControlFlowGraph.qll

@@ -1990,7 +1990,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
 
           /** Holds if `n` does not have a unique enclosing callable. */
           query predicate nonUniqueEnclosingCallable(AstNode n, int callables) {
-            callables = strictcount(getEnclosingCallable(n)) and callables > 1
+            callables = count(getEnclosingCallable(n)) and callables != 1
           }
 
           /**