Python tests: Update test results to account for better handling of branches in finally blocks.

Author: markshannon

python/ql/test/library-tests/ControlFlow/splitting/SuccessorCount.expected

@@ -81,6 +81,7 @@
 | 225 | split13 | test.py:225:12:225:14 | ControlFlowNode for var | 1 |
 | 225 | split13 | test.py:225:12:225:14 | ControlFlowNode for var | 1 |
 | 225 | split13 | test.py:225:12:225:14 | ControlFlowNode for var | 1 |
+| 225 | split13 | test.py:225:12:225:14 | ControlFlowNode for var | 1 |
 | 236 | split14 | test.py:236:8:236:15 | ControlFlowNode for UnaryExpr | 1 |
 | 236 | split14 | test.py:236:8:236:15 | ControlFlowNode for UnaryExpr | 1 |
 | 241 | split15 | test.py:241:8:241:10 | ControlFlowNode for var | 2 |

python/ql/test/library-tests/ControlFlow/truefalse/ExceptionalSuccessors.expected

@@ -11,6 +11,7 @@
 | true_false_test.py | 35 | true_false_test.py:35:18:35:26 | ControlFlowNode for range() | Entry node for Function func |
 | true_false_test.py | 48 | true_false_test.py:48:17:48:24 | ControlFlowNode for true12() | ControlFlowNode for ExceptStmt |
 | true_false_test.py | 48 | true_false_test.py:48:17:48:24 | ControlFlowNode for true12() | Entry node for Function func |
+| true_succ.py | 3 | true_succ.py:3:1:3:22 | ControlFlowNode for Function example | Entry node for Function example |
 | true_succ.py | 8 | true_succ.py:8:21:8:39 | ControlFlowNode for open() | ControlFlowNode for ExceptStmt |
 | true_succ.py | 8 | true_succ.py:8:21:8:39 | ControlFlowNode for open() | ControlFlowNode for f |
 | true_succ.py | 9 | true_succ.py:9:17:9:23 | ControlFlowNode for Attribute | ControlFlowNode for ExceptStmt |
@@ -20,6 +21,5 @@
 | true_succ.py | 11 | true_succ.py:11:17:11:19 | ControlFlowNode for sys | ControlFlowNode for f |
 | true_succ.py | 11 | true_succ.py:11:17:11:24 | ControlFlowNode for Attribute | ControlFlowNode for f |
 | true_succ.py | 11 | true_succ.py:11:17:11:27 | ControlFlowNode for Attribute() | ControlFlowNode for f |
-| true_succ.py | 13 | true_succ.py:13:16:13:28 | ControlFlowNode for Compare | Entry node for Function example |
 | true_succ.py | 13 | true_succ.py:13:31:13:39 | ControlFlowNode for Attribute() | Entry node for Function example |
 | true_succ.py | 13 | true_succ.py:13:31:13:39 | ControlFlowNode for Attribute() | Entry node for Function example |

python/ql/test/library-tests/ControlFlow/truefalse/TrueFalseSuccessors.expected

@@ -85,6 +85,7 @@
 | true_false_test.py | 85 | true_false_test.py:85:22:85:27 | ControlFlowNode for cond24 | ControlFlowNode for cond25 | True |
 | true_succ.py | 4 | true_succ.py:4:8:4:15 | ControlFlowNode for filename | ControlFlowNode for Str | False |
 | true_succ.py | 4 | true_succ.py:4:8:4:15 | ControlFlowNode for filename | ControlFlowNode for Try | True |
+| true_succ.py | 13 | true_succ.py:13:16:13:28 | ControlFlowNode for Compare | ControlFlowNode for Function example | False |
 | true_succ.py | 13 | true_succ.py:13:16:13:28 | ControlFlowNode for Compare | ControlFlowNode for Str | False |
 | true_succ.py | 13 | true_succ.py:13:16:13:28 | ControlFlowNode for Compare | ControlFlowNode for f | True |
 | true_succ.py | 13 | true_succ.py:13:16:13:28 | ControlFlowNode for Compare | ControlFlowNode for f | True |

python/ql/test/library-tests/PointsTo/new/Dataflow.expected

@@ -403,14 +403,14 @@
 | f_finally.py:1 | Queue_0 = ClassExpr |
 | f_finally.py:3 | close_0 = FunctionExpr |
 | f_finally.py:3 | close_4 = Pi(close_0) [false] |
-| f_finally.py:3 | close_5 = phi(close_3, close_4) |
+| f_finally.py:3 | close_5 = phi(close_2, close_4) |
 | f_finally.py:3 | self_0 = ParameterDefinition |
 | f_finally.py:3 | self_3 = phi(self_1, self_2) |
 | f_finally.py:4 | self_1 = AttributeAssignment '_closed'(self_0) |
 | f_finally.py:8 | close_0 = Attribute |
 | f_finally.py:8 | close_1 = Attribute |
-| f_finally.py:9 | close_2 = SingleSuccessorGuard(close_1) [true] |
-| f_finally.py:10 | close_3 = Pi(close_0) [true] |
+| f_finally.py:10 | close_2 = Pi(close_0) [true] |
+| f_finally.py:10 | close_3 = Pi(close_1) [true] |
 | f_finally.py:10 | self_2 = AttributeAssignment '_close'(self_1) |
 | g_class_init.py:0 | __name___0 = ScopeEntryDefinition |
 | g_class_init.py:0 | __package___0 = ScopeEntryDefinition |
@@ -699,7 +699,7 @@
 | r_regressions.py:13 | self_2 = AttributeAssignment '_close'(self_1) |
 | r_regressions.py:15 | close_0 = FunctionExpr |
 | r_regressions.py:15 | close_4 = Pi(close_0) [false] |
-| r_regressions.py:15 | close_5 = phi(close_3, close_4) |
+| r_regressions.py:15 | close_5 = phi(close_2, close_4) |
 | r_regressions.py:15 | gv_8 = ScopeEntryDefinition |
 | r_regressions.py:15 | gv_33 = phi(gv_9, gv_11) |
 | r_regressions.py:15 | self_0 = ParameterDefinition |
@@ -709,8 +709,8 @@
 | r_regressions.py:20 | close_0 = Attribute |
 | r_regressions.py:20 | close_1 = Attribute |
 | r_regressions.py:20 | gv_10 = phi(gv_8, gv_9) |
-| r_regressions.py:21 | close_2 = SingleSuccessorGuard(close_1) [true] |
-| r_regressions.py:22 | close_3 = Pi(close_0) [true] |
+| r_regressions.py:22 | close_2 = Pi(close_0) [true] |
+| r_regressions.py:22 | close_3 = Pi(close_1) [true] |
 | r_regressions.py:22 | self_2 = AttributeAssignment '_close'(self_1) |
 | r_regressions.py:23 | gv_11 = CallsiteRefinement(gv_9) |
 | r_regressions.py:27 | f_0 = FunctionExpr |

python/ql/test/query-tests/Resources/Dataflow.expected

@@ -14,38 +14,38 @@
 | f6_1 = open() | open |  |
 | f6_2 = MethodCallsiteRefinement(f6_1) | open |  |
 | f6_3 = phi(f6_0, f6_1, f6_2) | open |  |
-| f6_4 = SingleSuccessorGuard(f6_3) [true] | open |  |
-| f6_5 = Pi(f6_2) [true] | open |  |
-| f6_6 = MethodCallsiteRefinement(f6_5) | closed |  |
+| f6_4 = Pi(f6_2) [true] | open |  |
+| f6_5 = MethodCallsiteRefinement(f6_4) | closed |  |
+| f6_6 = Pi(f6_3) [true] | open |  |
 | f6_7 = Pi(f6_2) [false] | closed |  |
-| f6_8 = phi(f6_6, f6_7) | closed | exit |
+| f6_8 = phi(f6_5, f6_7) | closed | exit |
 | f7_0 = None | closed |  |
 | f7_1 = open() | open |  |
 | f7_2 = MethodCallsiteRefinement(f7_1) | open |  |
 | f7_3 = phi(f7_0, f7_1, f7_2) | open |  |
-| f7_4 = SingleSuccessorGuard(f7_3) [true] | open |  |
-| f7_5 = Pi(f7_2) [true] | open |  |
-| f7_6 = MethodCallsiteRefinement(f7_5) | closed |  |
+| f7_4 = Pi(f7_2) [true] | open |  |
+| f7_5 = MethodCallsiteRefinement(f7_4) | closed |  |
+| f7_6 = Pi(f7_3) [true] | open |  |
 | f7_7 = Pi(f7_2) [false] | closed |  |
-| f7_8 = phi(f7_6, f7_7) | closed | exit |
+| f7_8 = phi(f7_5, f7_7) | closed | exit |
 | f8_0 = None | closed |  |
 | f8_1 = open() | open |  |
 | f8_2 = MethodCallsiteRefinement(f8_1) | open |  |
 | f8_3 = phi(f8_0, f8_1, f8_2) | open |  |
-| f8_4 = SingleSuccessorGuard(f8_3) [true] | open |  |
-| f8_5 = Pi(f8_2) [true] | closed |  |
-| f8_6 = MethodCallsiteRefinement(f8_5) | closed |  |
+| f8_4 = Pi(f8_2) [true] | closed |  |
+| f8_5 = MethodCallsiteRefinement(f8_4) | closed |  |
+| f8_6 = Pi(f8_3) [true] | closed |  |
 | f8_7 = Pi(f8_2) [false] | open |  |
-| f8_8 = phi(f8_6, f8_7) | open | exit |
+| f8_8 = phi(f8_5, f8_7) | open | exit |
 | f9_0 = None | closed |  |
 | f9_1 = open() | open |  |
 | f9_2 = MethodCallsiteRefinement(f9_1) | open |  |
 | f9_3 = phi(f9_0, f9_1, f9_2) | open |  |
-| f9_4 = SingleSuccessorGuard(f9_3) [true] | open |  |
-| f9_5 = Pi(f9_2) [true] | closed |  |
-| f9_6 = MethodCallsiteRefinement(f9_5) | closed |  |
+| f9_4 = Pi(f9_2) [true] | closed |  |
+| f9_5 = MethodCallsiteRefinement(f9_4) | closed |  |
+| f9_6 = Pi(f9_3) [true] | closed |  |
 | f9_7 = Pi(f9_2) [false] | open |  |
-| f9_8 = phi(f9_6, f9_7) | open | exit |
+| f9_8 = phi(f9_5, f9_7) | open | exit |
 | f10_0 = open() | open |  |
 | f10_1 = MethodCallsiteRefinement(f10_0) | open |  |
 | f10_2 = MethodCallsiteRefinement(f10_1) | open |  |
@@ -96,21 +96,21 @@
 | f21_2 = MethodCallsiteRefinement(f21_1) | closed |  |
 | f21_3 = phi(f21_1, f21_2) | open |  |
 | f21_4 = phi(f21_0, f21_1, f21_2) | open |  |
-| f21_5 = SingleSuccessorGuard(f21_4) [true] | open |  |
-| f21_6 = Pi(f21_3) [true] | open |  |
-| f21_7 = MethodCallsiteRefinement(f21_6) | closed |  |
+| f21_5 = Pi(f21_3) [true] | open |  |
+| f21_6 = MethodCallsiteRefinement(f21_5) | closed |  |
+| f21_7 = Pi(f21_4) [true] | open |  |
 | f21_8 = Pi(f21_3) [false] | closed |  |
-| f21_9 = phi(f21_7, f21_8) | closed | exit |
+| f21_9 = phi(f21_6, f21_8) | closed | exit |
 | f22_0 = open() | open |  |
 | f22_1 = MethodCallsiteRefinement(f22_0) | open |  |
 | f22_2 = MethodCallsiteRefinement(f22_1) | closed |  |
 | f22_3 = phi(f22_1, f22_2) | open |  |
 | f22_4 = phi(f22_0, f22_1, f22_2) | open |  |
-| f22_5 = SingleSuccessorGuard(f22_4) [true] | open |  |
-| f22_6 = Pi(f22_3) [true] | closed |  |
-| f22_7 = MethodCallsiteRefinement(f22_6) | closed |  |
+| f22_5 = Pi(f22_3) [true] | closed |  |
+| f22_6 = MethodCallsiteRefinement(f22_5) | closed |  |
+| f22_7 = Pi(f22_4) [true] | closed |  |
 | f22_8 = Pi(f22_3) [false] | open |  |
-| f22_9 = phi(f22_7, f22_8) | open | exit |
+| f22_9 = phi(f22_6, f22_8) | open | exit |
 | f_0 = FunctionExpr | closed | exit |
 | file_0 = open() | open |  |
 | file_1 = open() | open |  |