From 2001ce34d4d9dfbe5acb031d32e5d4e7d1ea4a4d Mon Sep 17 00:00:00 2001 From: Anders Schack-Mulligen Date: Tue, 2 May 2023 10:18:37 +0200 Subject: [PATCH] Java/C#: Adjust references. --- csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll | 2 +- .../src/utils/modelgenerator/internal/CaptureModelsSpecific.qll | 2 +- java/ql/src/utils/modelgenerator/internal/CaptureModels.qll | 2 +- .../src/utils/modelgenerator/internal/CaptureModelsSpecific.qll | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll index 11bd2f32b58..e2a0e130ca4 100644 --- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll +++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll @@ -178,7 +178,7 @@ string captureThroughFlow(DataFlowTargetApi api) { string output | ThroughFlow::flow(p, returnNodeExt) and - returnNodeExt.getEnclosingCallable() = api and + returnNodeExt.(DataFlow::Node).getEnclosingCallable() = api and input = parameterNodeAsInput(p) and output = returnNodeAsOutput(returnNodeExt) and input != output and diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll index ea45e8e049b..29ab8a2c1dc 100644 --- a/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll +++ b/csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll @@ -121,7 +121,7 @@ class InstanceParameterNode = DataFlowPrivate::InstanceParameterNode; pragma[nomagic] private CS::Parameter getParameter(DataFlowImplCommon::ReturnNodeExt node, ParameterPosition pos) { - result = node.getEnclosingCallable().getParameter(pos.getPosition()) + result = node.(DataFlow::Node).getEnclosingCallable().getParameter(pos.getPosition()) } /** diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll index 11bd2f32b58..e2a0e130ca4 100644 --- a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll +++ b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll @@ -178,7 +178,7 @@ string captureThroughFlow(DataFlowTargetApi api) { string output | ThroughFlow::flow(p, returnNodeExt) and - returnNodeExt.getEnclosingCallable() = api and + returnNodeExt.(DataFlow::Node).getEnclosingCallable() = api and input = parameterNodeAsInput(p) and output = returnNodeAsOutput(returnNodeExt) and input != output and diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll index 349af01f790..e14850a5538 100644 --- a/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll +++ b/java/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll @@ -184,7 +184,7 @@ string returnNodeAsOutput(DataFlowImplCommon::ReturnNodeExt node) { exists(int pos | pos = node.getKind().(DataFlowImplCommon::ParamUpdateReturnKind).getPosition() | - result = parameterAccess(node.getEnclosingCallable().getParameter(pos)) + result = parameterAccess(node.(DataFlow::Node).getEnclosingCallable().getParameter(pos)) or result = qualifierString() and pos = -1 )