Skip to content

Commit 9116643

Browse files
aschackmullaschackmull
committed
Java/C++/C#: s/Callable/DataFlowCallable/
1 parent c6016bb commit 9116643

File tree

19 files changed

+76
-57
lines changed

19 files changed

+76
-57
lines changed

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎cpp/ql/src/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

‎csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,7 +2258,8 @@ private class PathNodeSink extends PathNodeImpl, TPathNodeSink {
22582258
*/
22592259
private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCtx sc, AccessPath ap) {
22602260
exists(
2261-
AccessPath ap0, Node midnode, Configuration conf, Callable enclosing, LocalCallContext localCC
2261+
AccessPath ap0, Node midnode, Configuration conf, DataFlowCallable enclosing,
2262+
LocalCallContext localCC
22622263
|
22632264
pathIntoLocalStep(mid, midnode, cc, enclosing, sc, ap0, conf) and
22642265
localCC = getLocalCallContext(cc, enclosing)
@@ -2297,8 +2298,8 @@ private predicate pathStep(PathNodeMid mid, Node node, CallContext cc, SummaryCt
22972298

22982299
pragma[nomagic]
22992300
private predicate pathIntoLocalStep(
2300-
PathNodeMid mid, Node midnode, CallContext cc, Callable enclosing, SummaryCtx sc, AccessPath ap0,
2301-
Configuration conf
2301+
PathNodeMid mid, Node midnode, CallContext cc, DataFlowCallable enclosing, SummaryCtx sc,
2302+
AccessPath ap0, Configuration conf
23022303
) {
23032304
midnode = mid.getNode() and
23042305
cc = mid.getCallContext() and

0 commit comments

Comments
 (0)