From aab5d0085d852b8e7f7332b1a5b2b608326b7779 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Fri, 18 Sep 2026 13:54:40 +0200
Subject: [PATCH] Unified: Expose Ast in the CFG.

---
 unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll | 5 ++---
 unified/ql/lib/ide-contextual-queries/printCfg.ql           | 3 ++-
 unified/ql/lib/unified.qll                                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll b/unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll
index e6dbd052c5b0..a01b95244c39 100644
--- a/unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll
+++ b/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;
diff --git a/unified/ql/lib/ide-contextual-queries/printCfg.ql b/unified/ql/lib/ide-contextual-queries/printCfg.ql
index f183c5c63cc9..aab7918d487e 100644
--- a/unified/ql/lib/ide-contextual-queries/printCfg.ql
+++ b/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)
diff --git a/unified/ql/lib/unified.qll b/unified/ql/lib/unified.qll
index 9729b6445812..b8dd4e9949fc 100644
--- a/unified/ql/lib/unified.qll
+++ b/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