Skip to content

Unified: Fix compilation in printCfg. #22625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aschackmull merged 1 commit into from
Sep 18, 2026
+5 −5
Merged

Unified: Fix compilation in printCfg. #22625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions unified/ql/lib/codeql/unified/internal/ControlFlowGraph.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion unified/ql/lib/ide-contextual-queries/printCfg.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/

private import unified
private import codeql.unified.internal.ControlFlowGraph
private import codeql.Locations

external string selectedSourceFile();
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion unified/ql/lib/unified.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading