C#: Fix merge conflict.

This commit is contained in:
calum
2019-03-01 08:54:27 +00:00
committed by Calum Grant
parent 741666d561
commit f7b4985ed1

View File

@@ -1273,7 +1273,7 @@ module DataFlow {
pragma[noinline]
private predicate jumpStepCand1(Node pred, Node succ, Configuration config) {
nodeCand1(succ, config) and
additionalJumpStep(mid, node, config)
additionalJumpStep(pred, succ, config)
}
pragma[noinline]