hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9686 from aschackmull/dataflow/no-node-scan

Browse Source 
Dataflow performance: Avoid node scans
This commit is contained in:
Jeroen Ketema
2022-06-29 10:38:56 +02:00
committed by GitHub
parent 968ede3d4a dc517a758e
commit 55e052af26
31 changed files with 279 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForOnActivityResult.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplForLibraries.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }

17
swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl.qll
View File

@@ -428,7 +428,7 @@ private predicate localFlowStep(NodeEx node1, NodeEx node2, Configuration config
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
simpleLocalFlowStepExt(n1, n2) and simpleLocalFlowStepExt(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
or or
@@ -447,7 +447,7 @@ private predicate additionalLocalFlowStep(NodeEx node1, NodeEx node2, Configurat
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
) )
@@ -466,7 +466,7 @@ private predicate additionalLocalStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) = getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -481,7 +481,7 @@ private predicate jumpStep(NodeEx node1, NodeEx node2, Configuration config) {
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
jumpStepCached(n1, n2) and jumpStepCached(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
) )
@@ -494,7 +494,7 @@ private predicate additionalJumpStep(NodeEx node1, NodeEx node2, Configuration c
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, n2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), pragma[only_bind_into](n2)) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext not config.getAFeature() instanceof FeatureEqualSourceSinkCallContext
@@ -507,7 +507,7 @@ private predicate additionalJumpStateStep(
exists(Node n1, Node n2 | exists(Node n1, Node n2 |
node1.asNode() = n1 and node1.asNode() = n1 and
node2.asNode() = n2 and node2.asNode() = n2 and
config.isAdditionalFlowStep(n1, s1, n2, s2) and config.isAdditionalFlowStep(pragma[only_bind_into](n1), s1, pragma[only_bind_into](n2), s2) and
getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and getNodeEnclosingCallable(n1) != getNodeEnclosingCallable(n2) and
stepFilter(node1, node2, config) and stepFilter(node1, node2, config) and
not stateBarrier(node1, s1, config) and not stateBarrier(node1, s1, config) and
@@ -518,7 +518,7 @@ private predicate additionalJumpStateStep(
pragma[nomagic] pragma[nomagic]
private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) { private predicate readSet(NodeEx node1, ContentSet c, NodeEx node2, Configuration config) {
readSet(node1.asNode(), c, node2.asNode()) and readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
or or
exists(Node n | exists(Node n |
@@ -562,7 +562,8 @@ pragma[nomagic]
private predicate store( private predicate store(
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
) { ) {
store(node1.asNode(), tc, node2.asNode(), contentType) and store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
contentType) and
read(_, tc.getContent(), _, config) and read(_, tc.getContent(), _, config) and
stepFilter(node1, node2, config) stepFilter(node1, node2, config)
} }