Merge pull request #1226 from hvitved/dataflow/prepare-for-csharp

Generalize data-flow library in preparation for C# adoption

Author: jbj

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

@@ -1,9 +1,6 @@
 private import cpp
-private import DataFlowPrivate
 
-Function viableImpl(MethodAccess ma) {
-  result = viableCallable(ma)
-}
+Function viableImpl(Call call) { result = viableCallable(call) }
 
 /**
  * Gets a function that might be called by `call`.
@@ -61,31 +58,23 @@ private predicate functionSignature(Function f, string qualifiedName, int nparam
  * Holds if the call context `ctx` reduces the set of viable dispatch
  * targets of `ma` in `c`.
  */
-predicate reducedViableImplInCallContext(MethodAccess ma, Callable c, Call ctx) {
-  none()
-}
+predicate reducedViableImplInCallContext(Call call, Function f, Call ctx) { none() }
 
 /**
  * Gets a viable dispatch target of `ma` in the context `ctx`. This is
  * restricted to those `ma`s for which the context makes a difference.
  */
-Method prunedViableImplInCallContext(MethodAccess ma, Call ctx) {
-  none()
-}
+Function prunedViableImplInCallContext(Call call, Call ctx) { none() }
 
 /**
  * Holds if flow returning from `m` to `ma` might return further and if
  * this path restricts the set of call sites that can be returned to.
  */
-predicate reducedViableImplInReturn(Method m, MethodAccess ma) {
-  none()
-}
+predicate reducedViableImplInReturn(Function f, Call call) { none() }
 
 /**
  * Gets a viable dispatch target of `ma` in the context `ctx`. This is
  * restricted to those `ma`s and results for which the return flow from the
  * result to `ma` restricts the possible context `ctx`.
  */
-Method prunedViableImplInCallContextReverse(MethodAccess ma, Call ctx) {
-  none()
-}
+Function prunedViableImplInCallContextReverse(Call call, Call ctx) { none() }