Merge pull request #22625 from aschackmull/unified/printcfg-fix

Unified: Fix compilation in printCfg.

Author: aschackmull

unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll

@@ -17,11 +17,10 @@ private module Cfg2 = Make2<Input>;
 
 private import Cfg0
 private import Cfg1
-private import Cfg2
-import Public
+import Cfg2
 
 /** Provides an implementation of the AST signature for Unified. */
-private module Ast implements AstSig<Location> {
+module Ast implements AstSig<Location> {
   private import unified as U
 
   class AstNode = U::AstNode;

unified/ql/lib/ide-contextual-queries/printCfg.ql

@@ -8,6 +8,7 @@
  */
 
 private import unified
+private import codeql.unified.internal.ControlFlowGraph
 private import codeql.Locations
 
 external string selectedSourceFile();
@@ -30,7 +31,7 @@ module ViewCfgQueryInput implements ControlFlow::ViewCfgQueryInputSig<File> {
   predicate selectedSourceColumn = selectedSourceColumnAlias/0;
 
   predicate cfgScopeSpan(
-    Callable scope, File file, int startLine, int startColumn, int endLine, int endColumn
+    Ast::Callable scope, File file, int startLine, int startColumn, int endLine, int endColumn
   ) {
     file = scope.getFile() and
     scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn)

unified/ql/lib/unified.qll

@@ -6,6 +6,6 @@ import codeql.Locations
 import codeql.files.FileSystem
 import codeql.unified.internal.Ast::UnifiedFinal
 import codeql.unified.internal.AstExtra::Public
-import codeql.unified.internal.ControlFlowGraph
+import codeql.unified.internal.ControlFlowGraph::Public
 import codeql.unified.internal.NameBinding::Public
 import codeql.unified.internal.dataflow.DataFlowPublic