Merge pull request github#1730 from markshannon/python-prepare-for-unrolling

Python prepare for implementing loop unrolling in extractor.

Author: taus-semmle

python/ql/test/library-tests/ControlFlow/pruning/Constraint.expected

@@ -33,7 +33,6 @@
 | 63 | seq2 | seq2 | Truthy | test |
 | 66 | seq3 | seq3 | Truthy | test |
 | 68 | UnaryExpr | seq4 | Falsey | test |
-| 78 | seq5 | seq5 | Truthy | test |
 | 88 | UnaryExpr | x | Falsey | test |
 | 90 | y | y | Truthy | test |
 | 93 | UnaryExpr | x | Falsey | test |

python/ql/test/library-tests/ControlFlow/pruning/test.expected

@@ -19,9 +19,6 @@
 | 52 | 1 |
 | 61 | 1 |
 | 64 | 1 |
-| 72 | 1 |
-| 75 | 1 |
-| 82 | 1 |
 | 94 | 0 |
 | 96 | 0 |
 | 103 | 0 |

python/ql/test/library-tests/ControlFlow/pruning/test.py

@@ -68,19 +68,19 @@ def loops(seq1, seq2, seq3, seq4, seq5):
     if not seq4:
         return
     #bool(seq3) is False; bool(seq4) is True
-    for var in seq3:
-        count #This is unreachable, but we cannot infer this yet.
-        print(var)
-    for var in seq4:
-        count
-        print(var)
-    #seq5 false then made true
-    if seq5:
-        return
-    seq5.append(1)
-    for var in seq5:
-        count
-        print(var)
+    #for var in seq3:
+    #    count #This is unreachable, but we cannot infer this yet.
+    #    print(var)
+    #for var in seq4:
+    #    count
+    #    print(var)
+    ##seq5 false then made true
+    #if seq5:
+    #    return
+    #seq5.append(1)
+    #for var in seq5:
+    #    count
+    #    print(var)
 
 #Logic does not apply to global variables in calls,
 #as they may be changed from true to false externally.