PS: Mirror the changes from #20300.

Author: MathiasVP

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

@@ -3,7 +3,6 @@
 private import powershell
 private import ControlFlowGraph
 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
@@ -163,13 +162,9 @@ 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;

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

@@ -1,8 +1,8 @@
 /** Provides classes representing the control flow graph. */
 
+import codeql.controlflow.SuccessorType
 private import powershell
 private import BasicBlocks
-private import SuccessorTypes
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import internal.Splitting as Splitting
 private import internal.Completion
@@ -57,73 +57,6 @@ class CfgNode extends CfgImpl::Node {
   BasicBlock getBasicBlock() { result.getANode() = this }
 }
 
-/** The type of a control flow successor. */
-class SuccessorType extends CfgImpl::TSuccessorType {
-  /** Gets a textual representation of successor type. */
-  string toString() { none() }
-}
-
-/** Provides different types of control flow successor types. */
-module SuccessorTypes {
-  /** A normal control flow successor. */
-  class NormalSuccessor extends SuccessorType, CfgImpl::TSuccessorSuccessor {
-    final override string toString() { result = "successor" }
-  }
-
-  /**
-   * A conditional control flow successor. Either a Boolean successor (`BooleanSuccessor`)
-   * or a matching successor (`MatchingSuccessor`)
-   */
-  abstract class ConditionalSuccessor extends SuccessorType {
-    boolean value;
-
-    bindingset[value]
-    ConditionalSuccessor() { any() }
-
-    /** Gets the Boolean value of this successor. */
-    final boolean getValue() { result = value }
-
-    override string toString() { result = this.getValue().toString() }
-  }
-
-  class BooleanSuccessor extends ConditionalSuccessor, CfgImpl::TBooleanSuccessor {
-    BooleanSuccessor() { this = CfgImpl::TBooleanSuccessor(value) }
-  }
-
-  class MatchingSuccessor extends ConditionalSuccessor, CfgImpl::TMatchingSuccessor {
-    MatchingSuccessor() { this = CfgImpl::TMatchingSuccessor(value) }
-  }
-
-  class ReturnSuccessor extends SuccessorType, CfgImpl::TReturnSuccessor {
-    final override string toString() { result = "return" }
-  }
-
-  class BreakSuccessor extends SuccessorType, CfgImpl::TBreakSuccessor {
-    final override string toString() { result = "break" }
-  }
-
-  class ContinueSuccessor extends SuccessorType, CfgImpl::TContinueSuccessor {
-    final override string toString() { result = "continue" }
-  }
-
-  class ThrowSuccessor extends SuccessorType, CfgImpl::TThrowSuccessor {
-    final override string toString() { result = "throw" }
-  }
-
-  class ExitSuccessor extends SuccessorType, CfgImpl::TExitSuccessor {
-    final override string toString() { result = "exit" }
-  }
-
-  class EmptinessSuccessor extends ConditionalSuccessor, CfgImpl::TEmptinessSuccessor {
-    EmptinessSuccessor() { this = CfgImpl::TEmptinessSuccessor(value) }
-
-    /** Holds if this is an empty successor. */
-    predicate isEmpty() { value = true }
-
-    override string toString() { if this.isEmpty() then result = "empty" else result = "non-empty" }
-  }
-}
-
 class Split = Splitting::Split;
 
 /** Provides different kinds of control flow graph splittings. */

powershell/ql/lib/semmle/code/powershell/controlflow/internal/Completion.qll

@@ -7,7 +7,6 @@
 private import powershell
 private import semmle.code.powershell.controlflow.ControlFlowGraph
 private import ControlFlowGraphImpl as CfgImpl
-private import SuccessorTypes
 private import codeql.util.Boolean
 
 // TODO: We most likely need a TrapCompletion as well
@@ -202,7 +201,7 @@ abstract class NormalCompletion extends Completion { }
 
 /** A simple (normal) completion. */
 class SimpleCompletion extends NormalCompletion, TSimpleCompletion {
-  override NormalSuccessor getAMatchingSuccessorType() { any() }
+  override DirectSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() { result = "simple" }
 }
@@ -293,7 +292,7 @@ class ContinueCompletion extends Completion, TContinueCompletion {
  * expression resulting in a thrown exception.
  */
 class ThrowCompletion extends Completion, TThrowCompletion {
-  override ThrowSuccessor getAMatchingSuccessorType() { any() }
+  override ExceptionSuccessor getAMatchingSuccessorType() { any() }
 
   override string toString() { result = "throw" }
 }

powershell/ql/lib/semmle/code/powershell/controlflow/internal/ControlFlowGraphImpl.qll

@@ -36,23 +36,10 @@ private module CfgInput implements CfgShared::InputSig<Location> {
     scope.(Impl::CfgScope).exit(last, c)
   }
 
-  class SuccessorType = Cfg::SuccessorType;
+  private class SuccessorType = Cfg::SuccessorType;
 
   SuccessorType getAMatchingSuccessorType(Completion c) { result = c.getAMatchingSuccessorType() }
 
-  predicate successorTypeIsSimple(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::NormalSuccessor
-  }
-
-  predicate successorTypeIsCondition(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::ConditionalSuccessor
-  }
-
-  predicate isAbnormalExitType(SuccessorType t) {
-    t instanceof Cfg::SuccessorTypes::ThrowSuccessor or
-    t instanceof Cfg::SuccessorTypes::ExitSuccessor
-  }
-
   private predicate id(Raw::Ast node1, Raw::Ast node2) { node1 = node2 }
 
   private predicate idOf(Raw::Ast node, int id) = equivalenceRelation(id/2)(node, id)
@@ -927,20 +914,3 @@ CfgScope getCfgScope(Ast n) {
     pragma[only_bind_into](result) = getCfgScopeImpl(n0)
   )
 }
-
-cached
-private module Cached {
-  cached
-  newtype TSuccessorType =
-    TSuccessorSuccessor() or
-    TBooleanSuccessor(Boolean b) or
-    TReturnSuccessor() or
-    TBreakSuccessor() or
-    TContinueSuccessor() or
-    TThrowSuccessor() or
-    TExitSuccessor() or
-    TMatchingSuccessor(Boolean b) or
-    TEmptinessSuccessor(Boolean b)
-}
-
-import Cached

powershell/ql/lib/semmle/code/powershell/controlflow/internal/Splitting.qll

@@ -6,7 +6,6 @@ private import powershell
 private import Completion as Comp
 private import Comp
 private import ControlFlowGraphImpl
-private import Cfg::SuccessorTypes
 private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
 
 cached

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

@@ -344,7 +344,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * from `bb1` to `bb2`.
      */
     predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
-      exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
+      exists(Cfg::ConditionalSuccessor s |
         this.getBasicBlock() = bb1 and
         bb2 = bb1.getASuccessor(s) and
         s.getValue() = branch

powershell/ql/src/experimental/ConvertToSecureStringAsPlainText.ql

@@ -10,10 +10,10 @@
  *       security
  */
 
- import powershell
+import powershell
 
- from CmdCall c 
- where 
- c.matchesName("ConvertTo-SecureString") and
- c.hasNamedArgument("asplaintext")
- select c, "Use of AsPlainText parameter in ConvertTo-SecureString call"
+from CmdCall c
+where
+  c.matchesName("ConvertTo-SecureString") and
+  c.hasNamedArgument("asplaintext")
+select c, "Use of AsPlainText parameter in ConvertTo-SecureString call"

powershell/ql/src/experimental/UseOfReservedCmdletChar.ql

@@ -10,21 +10,18 @@
  *       security
  */
 
- import powershell
+import powershell
 
 class ReservedCharacter extends string {
-    ReservedCharacter() { 
-        this = [
-        "!", "@", "#", "$",
-        "&", "*", "(", ")", 
-        "+", "=", "{", "^", 
-        "}", "[", "]", "|", 
-        ";", ":", "'", "\"", 
-        "<", ">", ",", "?", 
-        "/", "~"]
-    }
+  ReservedCharacter() {
+    this =
+      [
+        "!", "@", "#", "$", "&", "*", "(", ")", "+", "=", "{", "^", "}", "[", "]", "|", ";", ":",
+        "'", "\"", "<", ">", ",", "?", "/", "~"
+      ]
+  }
 }
 
 from Function f, ReservedCharacter r
-where f.getLowerCaseName().matches("%"+ r + "%")
-select f, "Function name contains a reserved character: " + r
+where f.getLowerCaseName().matches("%" + r + "%")
+select f, "Function name contains a reserved character: " + r

powershell/ql/src/experimental/UsernameOrPasswordParameter.ql

@@ -10,7 +10,7 @@
  *       security
  */
 
- import powershell
+import powershell
 
 from Parameter p
 where p.matchesName(["username", "password"])