From af3cce1af9f1a3dae67d8c6b1fbbda1b70b292c0 Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Thu, 22 Oct 2026 10:02:49 +0200 Subject: [PATCH] Unified: Instantiate and expose public SSA api. --- .../lib/codeql/unified/internal/FacadeAst.qll | 7 +++ .../unified/internal/dataflow/LocalSsa.qll | 52 +++++++++++++++++++ unified/ql/lib/unified.qll | 1 + 3 files changed, 60 insertions(+) diff --git a/unified/ql/lib/codeql/unified/internal/FacadeAst.qll b/unified/ql/lib/codeql/unified/internal/FacadeAst.qll index 56a995037711..46300a18a137 100644 --- a/unified/ql/lib/codeql/unified/internal/FacadeAst.qll +++ b/unified/ql/lib/codeql/unified/internal/FacadeAst.qll @@ -9,6 +9,7 @@ private import AstPlugin private import codeql.files.FileSystem private import codeql.unified.internal.NameBinding as NameBinding private import codeql.unified.internal.typeinference.TypeMention as TypeMention +private import codeql.unified.internal.ControlFlowGraph::Public module Unified { private import Ast::Unified as G @@ -133,6 +134,12 @@ module Unified { or result = this.getParent().(Argument).getParent() } + + /** Gets the `ControlFlowNode` corresponding to this expression. */ + ControlFlowNode getControlFlowNode() { result.injects(this) } + + /** Gets the basic block containing this expression. */ + BasicBlock getBasicBlock() { result = this.getControlFlowNode().getBasicBlock() } } class AccessorDeclaration extends G::AccessorDeclaration { diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll b/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll index b9c0f0a78ace..9a4a5f6cb137 100644 --- a/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll +++ b/unified/ql/lib/codeql/unified/internal/dataflow/LocalSsa.qll @@ -40,6 +40,58 @@ module LocalSsaOutput = Make; private import LocalSsaOutput +private module SsaInput implements SsaInputSig { + private import codeql.unified.internal.ExprPositions + + class Expr = U::Expr; + + class Parameter = U::Parameter; + + class VariableWrite instanceof BuilderNode { + private AstNode writeAccess; + + VariableWrite() { this.isLocalVariableWrite(writeAccess, _) } + + Expr asExpr() { hasIncomingValue(writeAccess, result) } + + Expr getValue() { + exists(VariableDeclaration decl | + writeAccess = decl.getPattern() and result = decl.getValue() + ) + or + exists(AssignExpr assignment | + writeAccess = assignment.getTarget() and result = assignment.getValue() + ) + or + writeAccess = result.(CompoundAssignExpr).getTarget() + // TODO: Add case for prefix unary crement operations + } + + predicate isParameterInit(Parameter p) { p.getPattern() = writeAccess } + + string toString() { result = super.toString() } + + Location getLocation() { result = super.getLocation() } + } + + predicate explicitWrite(VariableWrite w, BasicBlock bb, int i, LocalSsaInput::SourceVariable v) { + exists(AstNode repr | + w.(BuilderNode).isLocalVariableWrite(repr, v) and + performsVariableAccess(repr, v, _, bb.getNode(i)) + ) + } + + predicate explicitRead(Expr e, LocalSsaInput::SourceVariable v) { + e.(LocalVariableAccess).getLocalVariable() = v and hasResultValue(e) + } +} + +module SsaPublic { + module Ssa = MakeSsa; + + import Ssa +} + module LocalSsaDataFlowInput implements DataFlowIntegrationInputSig { class GuardValue = Void; diff --git a/unified/ql/lib/unified.qll b/unified/ql/lib/unified.qll index 7aed5441f0f7..ff3cc986a73e 100644 --- a/unified/ql/lib/unified.qll +++ b/unified/ql/lib/unified.qll @@ -9,4 +9,5 @@ import codeql.unified.internal.AstExtra::Public import codeql.unified.internal.ControlFlowGraph::Public import codeql.unified.internal.NameBinding::Public import codeql.unified.internal.dataflow.DataFlowPublic +import codeql.unified.internal.dataflow.LocalSsa::SsaPublic import codeql.unified.internal.mad.LegacyMaD::Public