C#: Update CIL SSA library to use parameterized module

Author: hvitved

config/identical-files.json

@@ -464,7 +464,6 @@
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
     "csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll",
-    "csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll",
     "ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll",
     "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll",
     "swift/ql/lib/codeql/swift/dataflow/internal/SsaImplCommon.qll"
@@ -602,4 +601,4 @@
     "javascript/ql/lib/semmle/javascript/security/IncompleteMultiCharacterSanitizationQuery.qll",
     "ruby/ql/lib/codeql/ruby/security/IncompleteMultiCharacterSanitizationQuery.qll"
   ]
-}
+}

csharp/ql/lib/semmle/code/cil/Ssa.qll

@@ -8,13 +8,12 @@ private import CIL
  * Provides classes for working with static single assignment (SSA) form.
  */
 module Ssa {
-  private import internal.SsaImplCommon as SsaImpl
-  private import internal.SsaImpl
+  private import internal.SsaImpl as SsaImpl
 
   /** An SSA definition. */
   class Definition extends SsaImpl::Definition {
     /** Gets a read of this SSA definition. */
-    final ReadAccess getARead() { result = getARead(this) }
+    final ReadAccess getARead() { result = SsaImpl::getARead(this) }
 
     /** Gets the underlying variable update, if any. */
     final VariableUpdate getVariableUpdate() {
@@ -25,11 +24,11 @@ module Ssa {
     }
 
     /** Gets a first read of this SSA definition. */
-    final ReadAccess getAFirstRead() { result = getAFirstRead(this) }
+    final ReadAccess getAFirstRead() { result = SsaImpl::getAFirstRead(this) }
 
     /** Holds if `first` and `second` are adjacent reads of this SSA definition. */
     final predicate hasAdjacentReads(ReadAccess first, ReadAccess second) {
-      hasAdjacentReads(this, first, second)
+      SsaImpl::hasAdjacentReads(this, first, second)
     }
 
     private Definition getAPhiInput() { result = this.(PhiNode).getAnInput() }
@@ -52,15 +51,15 @@ module Ssa {
     final override Location getLocation() { result = this.getBasicBlock().getLocation() }
 
     /** Gets an input to this phi node. */
-    final Definition getAnInput() { result = getAPhiInput(this) }
+    final Definition getAnInput() { result = SsaImpl::getAPhiInput(this) }
 
     /**
      * Holds if if `def` is an input to this phi node, and a reference to `def` at
      * index `i` in basic block `bb` can reach this phi node without going through
      * other references.
      */
     final predicate hasLastInputRef(Definition def, BasicBlock bb, int i) {
-      hasLastInputRef(this, def, bb, i)
+      SsaImpl::hasLastInputRef(this, def, bb, i)
     }
   }
 }

csharp/ql/lib/semmle/code/cil/internal/SsaImpl.qll

@@ -1,8 +1,40 @@
-private import semmle.code.cil.CIL
-private import SsaImplCommon
+private import cil
+private import semmle.code.csharp.dataflow.internal.SsaImplCommon as SsaImplCommon
+
+private module SsaInput implements SsaImplCommon::InputSig {
+  class BasicBlock = CIL::BasicBlock;
+
+  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
+
+  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+
+  class ExitBasicBlock = CIL::ExitBasicBlock;
+
+  class SourceVariable = CIL::StackVariable;
+
+  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    forceCachingInSameStage() and
+    exists(CIL::VariableUpdate vu |
+      vu.updatesAt(bb, i) and
+      v = vu.getVariable() and
+      certain = true
+    )
+  }
+
+  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    exists(CIL::ReadAccess ra | bb.getNode(i) = ra |
+      ra.getTarget() = v and
+      certain = true
+    )
+  }
+}
+
+import SsaImplCommon::Make<SsaInput>
 
 cached
 private module Cached {
+  private import CIL
+
   cached
   predicate forceCachingInSameStage() { any() }