C#: Replace references to old BaseSSA classes.

aschackmull · aschackmull · commit bbd60031b15f · 2026-04-22T11:53:40.000+02:00
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
@@ -133,53 +133,4 @@ module BaseSsa {
   module Ssa = SsaImpl::MakeSsa<SsaInput>;
 
   import Ssa
-
-  class Definition extends SsaImpl::Definition {
-    final AssignableRead getARead() {
-      exists(BasicBlock bb, int i |
-        SsaImpl::ssaDefReachesRead(_, this, bb, i) and
-        result.getControlFlowNode() = bb.getNode(i)
-      )
-    }
-
-    final AssignableDefinition getDefinition() {
-      exists(BasicBlock bb, int i, SsaImplInput::SourceVariable v |
-        this.definesAt(v, bb, i) and
-        definitionAt(result, bb, i, v)
-      )
-    }
-
-    final predicate isImplicitEntryDefinition(SsaImplInput::SourceVariable v) {
-      exists(BasicBlock bb |
-        this.definesAt(v, bb, -1) and
-        entryDef(_, bb, v)
-      )
-    }
-
-    private Definition getAPhiInputOrPriorDefinition() {
-      result = this.(PhiNode).getAnInput() or
-      SsaImpl::uncertainWriteDefinitionInput(this, result)
-    }
-
-    final Definition getAnUltimateDefinition() {
-      result = this.getAPhiInputOrPriorDefinition*() and
-      not result instanceof PhiNode
-    }
-
-    override Location getLocation() {
-      result = this.getDefinition().getLocation()
-      or
-      exists(Callable c, BasicBlock bb, SsaImplInput::SourceVariable v |
-        this.definesAt(v, bb, -1) and
-        entryDef(c, bb, v) and
-        result = c.getLocation()
-      )
-    }
-  }
-
-  class PhiNode extends SsaImpl::PhiNode, Definition {
-    override Location getLocation() { result = this.getBasicBlock().getLocation() }
-
-    final Definition getAnInput() { SsaImpl::phiHasInputFromBlock(this, result, _) }
-  }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/Steps.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/Steps.qll
@@ -15,8 +15,8 @@ module Steps {
    * Gets a read that may read the value assigned at definition `def`.
    */
   private AssignableRead getARead(AssignableDefinition def) {
-    exists(BaseSsa::Definition ssaDef |
-      ssaDef.getAnUltimateDefinition().getDefinition() = def and
+    exists(BaseSsa::SsaDefinition ssaDef |
+      ssaDef.getAnUltimateDefinition().(BaseSsa::SsaExplicitWrite).getDefinition() = def and
       result = ssaDef.getARead()
     )
     or
diff --git a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
@@ -355,8 +355,8 @@ private module Internal {
       1 < strictcount(this.getADynamicTarget().getUnboundDeclaration()) and
       c = this.getCall().getEnclosingCallable().getUnboundDeclaration() and
       (
-        exists(BaseSsa::Definition def, Parameter p |
-          def.isImplicitEntryDefinition(p) and
+        exists(BaseSsa::SsaParameterInit def, Parameter p |
+          def.getParameter() = p and
           this.getSyntheticQualifier() = def.getARead() and
           p.getPosition() = i and
           c.getAParameter() = p and
diff --git a/csharp/ql/test/library-tests/dataflow/ssa/BaseSsaConsistency.ql b/csharp/ql/test/library-tests/dataflow/ssa/BaseSsaConsistency.ql
@@ -1,7 +1,9 @@
 import csharp
 import semmle.code.csharp.dataflow.internal.BaseSSA
 
-from AssignableRead ar, BaseSsa::Definition ssaDef, AssignableDefinition def, LocalScopeVariable v
+from
+  AssignableRead ar, BaseSsa::SsaExplicitWrite ssaDef, AssignableDefinition def,
+  LocalScopeVariable v
 where
   ar = ssaDef.getARead() and
   def = ssaDef.getDefinition() and
