From 0bf0e0e16c11aa5c33b006a9410ee1a39fc55edb Mon Sep 17 00:00:00 2001 From: Rasmus Wriedt Larsen Date: Wed, 25 May 2022 09:56:10 +0200 Subject: [PATCH] Revert "Ruby: Fix performance for `argumentPositionMatch`" as requested to use a different performance fix and Revert "Dataflow: Sync `DataFlowImplCommon`" This reverts commit c9a833fc072fe11d46ac43397e5125a461d759a1 This reverts commit 911ddb9b2c4bf5c39efd7f633f2fb6bedbcb11db. --- .../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 ++-- .../python/dataflow/new/internal/DataFlowImplCommon.qll | 4 ++-- .../lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll index 51e4faaeaef..95b34f15dad 100644 --- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll +++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll @@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) { pragma[noinline] predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) { exists(ArgumentPosition apos | - arg.argumentOf(call, pragma[only_bind_into](apos)) and - parameterMatch(ppos, pragma[only_bind_into](apos)) + arg.argumentOf(call, apos) and + parameterMatch(ppos, apos) ) } diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll index 51e4faaeaef..95b34f15dad 100644 --- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll +++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll @@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) { pragma[noinline] predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) { exists(ArgumentPosition apos | - arg.argumentOf(call, pragma[only_bind_into](apos)) and - parameterMatch(ppos, pragma[only_bind_into](apos)) + arg.argumentOf(call, apos) and + parameterMatch(ppos, apos) ) } diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll index 51e4faaeaef..95b34f15dad 100644 --- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll +++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll @@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) { pragma[noinline] predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) { exists(ArgumentPosition apos | - arg.argumentOf(call, pragma[only_bind_into](apos)) and - parameterMatch(ppos, pragma[only_bind_into](apos)) + arg.argumentOf(call, apos) and + parameterMatch(ppos, apos) ) } diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll index 51e4faaeaef..95b34f15dad 100644 --- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll +++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll @@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) { pragma[noinline] predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) { exists(ArgumentPosition apos | - arg.argumentOf(call, pragma[only_bind_into](apos)) and - parameterMatch(ppos, pragma[only_bind_into](apos)) + arg.argumentOf(call, apos) and + parameterMatch(ppos, apos) ) } diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll index 51e4faaeaef..95b34f15dad 100644 --- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll +++ b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll @@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) { pragma[noinline] predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) { exists(ArgumentPosition apos | - arg.argumentOf(call, pragma[only_bind_into](apos)) and - parameterMatch(ppos, pragma[only_bind_into](apos)) + arg.argumentOf(call, apos) and + parameterMatch(ppos, apos) ) } diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll index 51e4faaeaef..95b34f15dad 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll @@ -80,8 +80,8 @@ predicate accessPathCostLimits(int apLimit, int tupleLimit) { pragma[noinline] predicate argumentPositionMatch(DataFlowCall call, ArgNode arg, ParameterPosition ppos) { exists(ArgumentPosition apos | - arg.argumentOf(call, pragma[only_bind_into](apos)) and - parameterMatch(ppos, pragma[only_bind_into](apos)) + arg.argumentOf(call, apos) and + parameterMatch(ppos, apos) ) }