Skip to content

Commit 3b1feee

Browse files
committed
C++: Remove unneeded isAdditionalFlowStep from dataflow test
Since the introduction of flow through global variables these additional steps are no longer needed.
1 parent 759ffc4 commit 3b1feee

File tree

1 file changed

+0
-18
lines changed
  • cpp/ql/test/library-tests/dataflow/dataflow-tests

1 file changed

+0
-18
lines changed

cpp/ql/test/library-tests/dataflow/dataflow-tests/test.ql

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -77,27 +77,9 @@ module IRTest {
7777
)
7878
}
7979

80-
override predicate isAdditionalFlowStep(DataFlow::Node n1, DataFlow::Node n2) {
81-
exists(GlobalOrNamespaceVariable var | var.getName().matches("flowTestGlobal%") |
82-
writesVariable(n1.asInstruction(), var) and
83-
var = n2.asVariable()
84-
or
85-
readsVariable(n2.asInstruction(), var) and
86-
var = n1.asVariable()
87-
)
88-
}
89-
9080
override predicate isBarrier(DataFlow::Node barrier) {
9181
barrier.asExpr().(VariableAccess).getTarget().hasName("barrier") or
9282
barrier = DataFlow::InstructionBarrierGuard<testBarrierGuard/3>::getABarrierNode()
9383
}
9484
}
95-
96-
private predicate readsVariable(LoadInstruction load, Variable var) {
97-
load.getSourceAddress().(VariableAddressInstruction).getAstVariable() = var
98-
}
99-
100-
private predicate writesVariable(StoreInstruction store, Variable var) {
101-
store.getDestinationAddress().(VariableAddressInstruction).getAstVariable() = var
102-
}
10385
}

0 commit comments

Comments
 (0)