hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Java: Refactor to improve join-pipeline.

Browse Source
This commit is contained in:
Anders Schack-Mulligen
2019-10-08 17:15:06 +02:00
parent 20084fb3c0
commit 5e0ce81030
19 changed files with 114 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
View File

@@ -1734,16 +1734,17 @@ private class PathNodeSink extends PathNode, TPathNodeSink {
* a callable is recorded by `cc`.
*/
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, AccessPath ap) {
exists(LocalCallContext localCC, AccessPath ap0, boolean preservesValue |
localCC = getLocalCallContext(cc, mid.getNode().getEnclosingCallable()) and
localFlowBigStep(mid.getNode(), node, preservesValue, mid.getConfiguration(), localCC) and
exists(LocalCallContext localCC, AccessPath ap0, Node midnode, Configuration conf |
midnode = mid.getNode() and
conf = mid.getConfiguration() and
cc = mid.getCallContext() and
localCC = getLocalCallContext(cc, midnode.getEnclosingCallable()) and
ap0 = mid.getAp()
|
preservesValue = true and
localFlowBigStep(midnode, node, true, conf, localCC) and
ap = ap0
or
preservesValue = false and
localFlowBigStep(midnode, node, false, conf, localCC) and
ap0 instanceof AccessPathNil and
ap = node.(AccessPathNilNode).getAp()
)

11
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
View File

@@ -1734,16 +1734,17 @@ private class PathNodeSink extends PathNode, TPathNodeSink {
* a callable is recorded by `cc`.
*/
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, AccessPath ap) {
exists(LocalCallContext localCC, AccessPath ap0, boolean preservesValue |
localCC = getLocalCallContext(cc, mid.getNode().getEnclosingCallable()) and
localFlowBigStep(mid.getNode(), node, preservesValue, mid.getConfiguration(), localCC) and
exists(LocalCallContext localCC, AccessPath ap0, Node midnode, Configuration conf |
midnode = mid.getNode() and
conf = mid.getConfiguration() and
cc = mid.getCallContext() and
localCC = getLocalCallContext(cc, midnode.getEnclosingCallable()) and
ap0 = mid.getAp()
|
preservesValue = true and
localFlowBigStep(midnode, node, true, conf, localCC) and
ap = ap0
or
preservesValue = false and
localFlowBigStep(midnode, node, false, conf, localCC) and
ap0 instanceof AccessPathNil and
ap = node.(AccessPathNilNode).getAp()
)

11
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
View File

@@ -1734,16 +1734,17 @@ private class PathNodeSink extends PathNode, TPathNodeSink {
* a callable is recorded by `cc`.
*/
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, AccessPath ap) {
exists(LocalCallContext localCC, AccessPath ap0, boolean preservesValue |
localCC = getLocalCallContext(cc, mid.getNode().getEnclosingCallable()) and
localFlowBigStep(mid.getNode(), node, preservesValue, mid.getConfiguration(), localCC) and
exists(LocalCallContext localCC, AccessPath ap0, Node midnode, Configuration conf |
midnode = mid.getNode() and
conf = mid.getConfiguration() and
cc = mid.getCallContext() and
localCC = getLocalCallContext(cc, midnode.getEnclosingCallable()) and
ap0 = mid.getAp()
|
preservesValue = true and
localFlowBigStep(midnode, node, true, conf, localCC) and
ap = ap0
or
preservesValue = false and
localFlowBigStep(midnode, node, false, conf, localCC) and
ap0 instanceof AccessPathNil and
ap = node.(AccessPathNilNode).getAp()
)

11
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
View File

@@ -1734,16 +1734,17 @@ private class PathNodeSink extends PathNode, TPathNodeSink {
* a callable is recorded by `cc`.
*/
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, AccessPath ap) {
exists(LocalCallContext localCC, AccessPath ap0, boolean preservesValue |
localCC = getLocalCallContext(cc, mid.getNode().getEnclosingCallable()) and
localFlowBigStep(mid.getNode(), node, preservesValue, mid.getConfiguration(), localCC) and
exists(LocalCallContext localCC, AccessPath ap0, Node midnode, Configuration conf |
midnode = mid.getNode() and
conf = mid.getConfiguration() and
cc = mid.getCallContext() and
localCC = getLocalCallContext(cc, midnode.getEnclosingCallable()) and
ap0 = mid.getAp()
|
preservesValue = true and
localFlowBigStep(midnode, node, true, conf, localCC) and
ap = ap0
or
preservesValue = false and
localFlowBigStep(midnode, node, false, conf, localCC) and
ap0 instanceof AccessPathNil and
ap = node.(AccessPathNilNode).getAp()
)

11
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
View File

@@ -1734,16 +1734,17 @@ private class PathNodeSink extends PathNode, TPathNodeSink {
* a callable is recorded by `cc`.
*/
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, AccessPath ap) {
exists(LocalCallContext localCC, AccessPath ap0, boolean preservesValue |
localCC = getLocalCallContext(cc, mid.getNode().getEnclosingCallable()) and
localFlowBigStep(mid.getNode(), node, preservesValue, mid.getConfiguration(), localCC) and
exists(LocalCallContext localCC, AccessPath ap0, Node midnode, Configuration conf |
midnode = mid.getNode() and
conf = mid.getConfiguration() and
cc = mid.getCallContext() and
localCC = getLocalCallContext(cc, midnode.getEnclosingCallable()) and
ap0 = mid.getAp()
|
preservesValue = true and
localFlowBigStep(midnode, node, true, conf, localCC) and
ap = ap0
or
preservesValue = false and
localFlowBigStep(midnode, node, false, conf, localCC) and
ap0 instanceof AccessPathNil and
ap = node.(AccessPathNilNode).getAp()
)