PS: Fixup libraries after github#20253.

Author: MathiasVP

powershell/ql/lib/semmle/code/powershell/controlflow/BasicBlocks.qll

@@ -6,6 +6,7 @@ private import CfgNodes
 private import SuccessorTypes
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -157,3 +158,23 @@ final class JoinBlockPredecessor extends BasicBlock, BasicBlocksImpl::JoinPredec
  * control flow.
  */
 final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBlock { }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+private class SuccessorTypeAlias = SuccessorType;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = CfgNode;
+
+  class SuccessorType = SuccessorTypeAlias;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}

powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll

@@ -1,23 +1,17 @@
 private import codeql.ssa.Ssa as SsaImplCommon
 private import powershell
 private import semmle.code.powershell.Cfg as Cfg
+private import semmle.code.powershell.controlflow.BasicBlocks as BasicBlocks
 private import semmle.code.powershell.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 private import semmle.code.powershell.dataflow.Ssa
 import Cfg::CfgNodes
 private import ExprNodes
 private import StmtNodes
 
-module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
-  private import semmle.code.powershell.controlflow.BasicBlocks as BasicBlocks
-
-  class BasicBlock = BasicBlocks::BasicBlock;
-
-  class ControlFlowNode = Cfg::CfgNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
+private class BasicBlock = BasicBlocks::Cfg::BasicBlock;
 
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
+  private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
 
   class SourceVariable = Variable;
 
@@ -54,7 +48,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -300,7 +294,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
 
     predicate isFinalEnvVarRead(Scope scope, EnvVariable v) { this = TFinalEnvVarRead(scope, v) }
 
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) {
+    predicate hasCfgNode(BasicBlock bb, int i) {
       this.asExprCfgNode() = bb.getNode(i)
       or
       exists(EnvVariable v |
@@ -341,19 +335,15 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
      * guard to `branch`.
      */
-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
 
     /**
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
         this.getBasicBlock() = bb1 and
         bb2 = bb1.getASuccessor(s) and
@@ -363,9 +353,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
-    none()
-  }
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue branch) { none() }
 }
 
 private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;