C#: Revert a few changes

Author: hvitved

csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowDispatch.qll

@@ -334,7 +334,7 @@ class NonDelegateDataFlowCall extends DataFlowCall, TNonDelegateCall {
 
   override DataFlow::ExprNode getNode() { result.getControlFlowNode() = cfn }
 
-  override DotNet::Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
+  override Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
 
   override string toString() { result = cfn.toString() }
 
@@ -365,7 +365,7 @@ class ExplicitDelegateDataFlowCall extends DelegateDataFlowCall, TExplicitDelega
 
   override DataFlow::ExprNode getNode() { result.getControlFlowNode() = cfn }
 
-  override DotNet::Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
+  override Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
 
   override string toString() { result = cfn.toString() }
 
@@ -404,7 +404,7 @@ class ImplicitDelegateDataFlowCall extends DelegateDataFlowCall, TImplicitDelega
 
   override ImplicitDelegateOutNode getNode() { result.getControlFlowNode() = cfn }
 
-  override DotNet::Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
+  override Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
 
   override string toString() { result = "[implicit call] " + cfn.toString() }
 
@@ -421,13 +421,13 @@ class TransitiveCapturedDataFlowCall extends DataFlowCall, TTransitiveCapturedCa
 
   TransitiveCapturedDataFlowCall() { this = TTransitiveCapturedCall(cfn) }
 
-  override DotNet::Callable getARuntimeTarget() { transitiveCapturedCallTarget(cfn, result) }
+  override Callable getARuntimeTarget() { transitiveCapturedCallTarget(cfn, result) }
 
   override ControlFlow::Nodes::ElementNode getControlFlowNode() { result = cfn }
 
   override DataFlow::ExprNode getNode() { none() }
 
-  override DotNet::Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
+  override Callable getEnclosingCallable() { result = cfn.getEnclosingCallable() }
 
   override string toString() { result = "[transitive] " + cfn.toString() }
 
@@ -449,7 +449,7 @@ class CilDataFlowCall extends DataFlowCall, TCilCall {
 
   override DataFlow::ExprNode getNode() { result.getExpr() = call }
 
-  override DotNet::Callable getEnclosingCallable() { result = call.getEnclosingCallable() }
+  override CIL::Callable getEnclosingCallable() { result = call.getEnclosingCallable() }
 
   override string toString() { result = call.toString() }
 

csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll

@@ -17,15 +17,15 @@ private import semmle.code.csharp.frameworks.NHibernate
 private module ThisFlow {
   private class BasicBlock = ControlFlow::BasicBlock;
 
-  /** Holds if the `i`th node `n` of basic block `bb` is a `this` access. */
-  private predicate thisAccess(Node n, BasicBlock bb, int i) {
-    bb.getNode(i) = any(ControlFlow::Nodes::EntryNode en |
-        n.(InstanceParameterNode).getCallable() = en.getEnclosingCallable()
-      )
+  /** Holds if `n` is a `this` access at control flow node `cfn`. */
+  private predicate thisAccess(Node n, ControlFlow::Node cfn) {
+    n.(InstanceParameterNode).getCallable() = cfn.(ControlFlow::Nodes::EntryNode).getCallable()
     or
-    n.asExprAtNode(bb.getNode(i)) = any(Expr e | e instanceof ThisAccess or e instanceof BaseAccess)
+    n.asExprAtNode(cfn) = any(Expr e | e instanceof ThisAccess or e instanceof BaseAccess)
   }
 
+  private predicate thisAccess(Node n, BasicBlock bb, int i) { thisAccess(n, bb.getNode(i)) }
+
   private predicate thisRank(Node n, BasicBlock bb, int rankix) {
     exists(int i |
       i = rank[rankix](int j | thisAccess(_, bb, j)) and
@@ -470,16 +470,16 @@ private module ParameterNodes {
 
   /** An implicit instance (`this`) parameter. */
   class InstanceParameterNode extends ParameterNode, TInstanceParameterNode {
-    private DataFlowCallable callable;
+    private Callable callable;
 
     InstanceParameterNode() { this = TInstanceParameterNode(callable) }
 
     /** Gets the callable containing this implicit instance parameter. */
-    DataFlowCallable getCallable() { result = callable }
+    Callable getCallable() { result = callable }
 
     override predicate isParameterOf(DataFlowCallable c, int pos) { callable = c and pos = -1 }
 
-    override DataFlowCallable getEnclosingCallable() { result = callable }
+    override Callable getEnclosingCallable() { result = callable }
 
     override Type getType() { result = callable.getDeclaringType() }
 
@@ -511,7 +511,7 @@ private module ParameterNodes {
       i = parameter.getPosition() + c.getNumberOfParameters()
     }
 
-    override DotNet::Callable getEnclosingCallable() {
+    override Callable getEnclosingCallable() {
       result = this.getUnderlyingNode().getEnclosingCallable()
     }
 
@@ -852,7 +852,7 @@ private module ReturnNodes {
 
     override YieldReturnKind getKind() { any() }
 
-    override DotNet::Callable getEnclosingCallable() {
+    override Callable getEnclosingCallable() {
       result = this.getUnderlyingNode().getEnclosingCallable()
     }