From 0bd81eb4b8513b9595bb02240c725cb7e1b71ce8 Mon Sep 17 00:00:00 2001
From: Anders Schack-Mulligen <aschackmull@github.com>
Date: Mon, 29 Jun 2020 16:22:58 +0200
Subject: [PATCH] Dataflow: Fix reference to viableCallable.

---
 .../semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll  | 4 ++--
 .../code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll      | 4 ++--
 .../code/csharp/dataflow/internal/DataFlowImplCommon.qll      | 4 ++--
 .../semmle/code/java/dataflow/internal/DataFlowImplCommon.qll | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
index a1e5d308568..c02a2f4d6fe 100644
--- a/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
+++ b/cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll
@@ -344,7 +344,7 @@ private module Cached {
         mayBenefitFromCallContext(call, c) and
         c = viableCallable(ctx) and
         ctxtgts = count(viableImplInCallContext(call, ctx)) and
-        tgts = strictcount(viableImpl(call)) and
+        tgts = strictcount(viableCallable(call)) and
         ctxtgts < tgts
       )
     }
@@ -369,7 +369,7 @@ private module Cached {
     predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call) {
       exists(int tgts, int ctxtgts |
         mayBenefitFromCallContext(call, _) and
-        c = viableImpl(call) and
+        c = viableCallable(call) and
         ctxtgts = count(DataFlowCall ctx | c = viableImplInCallContext(call, ctx)) and
         tgts = strictcount(DataFlowCall ctx | viableCallable(ctx) = call.getEnclosingCallable()) and
         ctxtgts < tgts
diff --git a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
index a1e5d308568..c02a2f4d6fe 100644
--- a/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
+++ b/cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll
@@ -344,7 +344,7 @@ private module Cached {
         mayBenefitFromCallContext(call, c) and
         c = viableCallable(ctx) and
         ctxtgts = count(viableImplInCallContext(call, ctx)) and
-        tgts = strictcount(viableImpl(call)) and
+        tgts = strictcount(viableCallable(call)) and
         ctxtgts < tgts
       )
     }
@@ -369,7 +369,7 @@ private module Cached {
     predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call) {
       exists(int tgts, int ctxtgts |
         mayBenefitFromCallContext(call, _) and
-        c = viableImpl(call) and
+        c = viableCallable(call) and
         ctxtgts = count(DataFlowCall ctx | c = viableImplInCallContext(call, ctx)) and
         tgts = strictcount(DataFlowCall ctx | viableCallable(ctx) = call.getEnclosingCallable()) and
         ctxtgts < tgts
diff --git a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
index a1e5d308568..c02a2f4d6fe 100644
--- a/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
+++ b/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll
@@ -344,7 +344,7 @@ private module Cached {
         mayBenefitFromCallContext(call, c) and
         c = viableCallable(ctx) and
         ctxtgts = count(viableImplInCallContext(call, ctx)) and
-        tgts = strictcount(viableImpl(call)) and
+        tgts = strictcount(viableCallable(call)) and
         ctxtgts < tgts
       )
     }
@@ -369,7 +369,7 @@ private module Cached {
     predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call) {
       exists(int tgts, int ctxtgts |
         mayBenefitFromCallContext(call, _) and
-        c = viableImpl(call) and
+        c = viableCallable(call) and
         ctxtgts = count(DataFlowCall ctx | c = viableImplInCallContext(call, ctx)) and
         tgts = strictcount(DataFlowCall ctx | viableCallable(ctx) = call.getEnclosingCallable()) and
         ctxtgts < tgts
diff --git a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
index a1e5d308568..c02a2f4d6fe 100644
--- a/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
+++ b/java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll
@@ -344,7 +344,7 @@ private module Cached {
         mayBenefitFromCallContext(call, c) and
         c = viableCallable(ctx) and
         ctxtgts = count(viableImplInCallContext(call, ctx)) and
-        tgts = strictcount(viableImpl(call)) and
+        tgts = strictcount(viableCallable(call)) and
         ctxtgts < tgts
       )
     }
@@ -369,7 +369,7 @@ private module Cached {
     predicate reducedViableImplInReturn(DataFlowCallable c, DataFlowCall call) {
       exists(int tgts, int ctxtgts |
         mayBenefitFromCallContext(call, _) and
-        c = viableImpl(call) and
+        c = viableCallable(call) and
         ctxtgts = count(DataFlowCall ctx | c = viableImplInCallContext(call, ctx)) and
         tgts = strictcount(DataFlowCall ctx | viableCallable(ctx) = call.getEnclosingCallable()) and
         ctxtgts < tgts