C#: Remove deprecated references to deprecated shared code

hvitved · hvitved · commit 14dd72b3b1c6 · 2026-04-23T11:28:33.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
@@ -311,69 +311,6 @@ module Ssa {
       result.getControlFlowNode() = cfn
     }
 
-    /**
-     * Gets a last read of the source variable underlying this SSA definition.
-     * That is, a read that can reach the end of the enclosing callable, or
-     * another SSA definition for the source variable, without passing through
-     * any other read. Example:
-     *
-     * ```csharp
-     * int Field;
-     *
-     * void SetField(int i) {
-     *   this.Field = i;
-     *   Use(this.Field);
-     *   if (i > 0)
-     *     this.Field = i - 1;
-     *   else if (i < 0)
-     *     SetField(1);
-     *   Use(this.Field);
-     *   Use(this.Field);
-     * }
-     * ```
-     *
-     * - The reads of `i` on lines 7 and 8 are the last reads for the implicit
-     *   parameter definition on line 3.
-     * - The read of `this.Field` on line 5 is a last read of the definition on
-     *   line 4.
-     * - The read of `this.Field` on line 11 is a last read of the phi node
-     *   between lines 9 and 10.
-     */
-    deprecated final AssignableRead getALastRead() { result = this.getALastReadAtNode(_) }
-
-    /**
-     * Gets a last read of the source variable underlying this SSA definition at
-     * control flow node `cfn`. That is, a read that can reach the end of the
-     * enclosing callable, or another SSA definition for the source variable,
-     * without passing through any other read. Example:
-     *
-     * ```csharp
-     * int Field;
-     *
-     * void SetField(int i) {
-     *   this.Field = i;
-     *   Use(this.Field);
-     *   if (i > 0)
-     *     this.Field = i - 1;
-     *   else if (i < 0)
-     *     SetField(1);
-     *   Use(this.Field);
-     *   Use(this.Field);
-     * }
-     * ```
-     *
-     * - The reads of `i` on lines 7 and 8 are the last reads for the implicit
-     *   parameter definition on line 3.
-     * - The read of `this.Field` on line 5 is a last read of the definition on
-     *   line 4.
-     * - The read of `this.Field` on line 11 is a last read of the phi node
-     *   between lines 9 and 10.
-     */
-    deprecated final AssignableRead getALastReadAtNode(ControlFlowNode cfn) {
-      SsaImpl::lastReadSameVar(this, cfn) and
-      result.getControlFlowNode() = cfn
-    }
-
     /**
      * Gets an SSA definition whose value can flow to this one in one step. This
      * includes inputs to phi nodes and the prior definitions of uncertain writes.
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
@@ -713,61 +713,6 @@ private predicate variableReadPseudo(BasicBlock bb, int i, Ssa::SourceVariable v
   refReadBeforeWrite(bb, i, v)
 }
 
-pragma[noinline]
-deprecated private predicate adjacentDefRead(
-  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
-) {
-  Impl::adjacentDefRead(def, bb1, i1, bb2, i2) and
-  v = def.getSourceVariable()
-}
-
-deprecated private predicate adjacentDefReachesRead(
-  Definition def, SsaInput::SourceVariable v, BasicBlock bb1, int i1, BasicBlock bb2, int i2
-) {
-  adjacentDefRead(def, bb1, i1, bb2, i2, v) and
-  (
-    def.definesAt(v, bb1, i1)
-    or
-    SsaInput::variableRead(bb1, i1, v, true)
-  )
-  or
-  exists(BasicBlock bb3, int i3 |
-    adjacentDefReachesRead(def, v, bb1, i1, bb3, i3) and
-    SsaInput::variableRead(bb3, i3, _, false) and
-    Impl::adjacentDefRead(def, bb3, i3, bb2, i2)
-  )
-}
-
-deprecated private predicate adjacentDefReachesUncertainRead(
-  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
-) {
-  exists(SsaInput::SourceVariable v |
-    adjacentDefReachesRead(def, v, bb1, i1, bb2, i2) and
-    SsaInput::variableRead(bb2, i2, v, false)
-  )
-}
-
-/** Same as `lastRefRedef`, but skips uncertain reads. */
-pragma[nomagic]
-deprecated private predicate lastRefSkipUncertainReads(Definition def, BasicBlock bb, int i) {
-  Impl::lastRef(def, bb, i) and
-  not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
-  or
-  exists(BasicBlock bb0, int i0 |
-    Impl::lastRef(def, bb0, i0) and
-    adjacentDefReachesUncertainRead(def, bb, i, bb0, i0)
-  )
-}
-
-pragma[nomagic]
-deprecated predicate lastReadSameVar(Definition def, ControlFlowNode cfn) {
-  exists(BasicBlock bb, int i |
-    lastRefSkipUncertainReads(def, bb, i) and
-    variableReadActual(bb, i, _) and
-    cfn = bb.getNode(i)
-  )
-}
-
 cached
 private module Cached {
   cached
