Skip to content

Commit 335e1a8

Browse files
hvitvedhvitved
committed
Address review comments
1 parent 45fc62f commit 335e1a8

36 files changed

+72
-72
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplForContentDataFlow.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

‎java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,15 +559,15 @@ pragma[nomagic]
559559
private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
560560

561561
pragma[nomagic]
562-
private predicate readProj(Content c, Configuration config) { read(_, c, _, config) }
562+
private predicate hasReadStep(Content c, Configuration config) { read(_, c, _, config) }
563563

564564
pragma[nomagic]
565565
private predicate store(
566566
NodeEx node1, TypedContent tc, NodeEx node2, DataFlowType contentType, Configuration config
567567
) {
568568
store(pragma[only_bind_into](node1.asNode()), tc, pragma[only_bind_into](node2.asNode()),
569569
contentType) and
570-
readProj(tc.getContent(), config) and
570+
hasReadStep(tc.getContent(), config) and
571571
stepFilter(node1, node2, config)
572572
}
573573

0 commit comments

Comments
 (0)