Small tweaks.

Author: aschackmull

shared/controlflow/codeql/controlflow/AstConsistency.qll

@@ -129,17 +129,16 @@ module MakeAstConsistency<LocationSig Location, AstSig<Location> Ast> {
       query = "multipleParents" and
       results = strictcount(AstNode child | multipleParents(child, _, _))
       or
-      query = "nonAncestorEnclosingCallable" and
-      results = strictcount(AstNode node | nonAncestorEnclosingCallable(node, _))
-      or
       query = "childAtMultipleIndices" and
       results = strictcount(AstNode child | childAtMultipleIndices(_, child, _, _))
       or
       query = "siblingsWithIdenticalIndex" and
-      results = strictcount(AstNode parent, int index | siblingsWithIdenticalIndex(parent, index, _, _))
+      results =
+        strictcount(AstNode parent, int index | siblingsWithIdenticalIndex(parent, index, _, _))
       or
       query = "memberChildMissingFromGetChild" and
-      results = strictcount(AstNode parent, AstNode child | memberChildMissingFromGetChild(parent, child, _))
+      results =
+        strictcount(AstNode parent, AstNode child | memberChildMissingFromGetChild(parent, child, _))
       or
       query = "getChildMissingFromMember" and
       results = strictcount(AstNode parent, int index | getChildMissingFromMember(parent, index, _))
@@ -152,15 +151,6 @@ module MakeAstConsistency<LocationSig Location, AstSig<Location> Ast> {
       parent1 != parent2
     }
 
-    /**
-     * Holds if `node` has an enclosing callable that is not reachable through
-     * parent steps.
-     */
-    query predicate nonAncestorEnclosingCallable(AstNode node, Callable callable) {
-      callable = getEnclosingCallable(node) and
-      not getParent*(node) = callable
-    }
-
     /** Holds if `child` is assigned multiple child indices under `parent`. */
     query predicate childAtMultipleIndices(AstNode parent, AstNode child, int index1, int index2) {
       getChild(parent, index1) = child and
@@ -179,6 +169,7 @@ module MakeAstConsistency<LocationSig Location, AstSig<Location> Ast> {
 
     /** Holds if a member child relation is not reflected by `getChild`. */
     query predicate memberChildMissingFromGetChild(AstNode parent, AstNode child, string member) {
+      exists(getEnclosingCallable(parent)) and
       astMemberChild(parent, child, member) and
       not getChild(parent, _) = child
     }

shared/controlflow/codeql/controlflow/ControlFlowGraph.qll

@@ -2063,7 +2063,7 @@ module Make0<LocationSig Location, AstSig<Location> Ast> {
          */
 
         private import PrintGraph as Pp
-        private import AstConsistency
+        private import codeql.controlflow.AstConsistency
 
         private class ControlFlowNodeAlias = ControlFlowNode;