Fix control flow graph for try statements with finally clause, fixes bug

2008-11-17  Jürg Billeter  <j@bitron.ch>

	* vala/valaflowanalyzer.vala:

	Fix control flow graph for try statements with finally clause,
	fixes bug 561115

svn path=/trunk/; revision=2028

diff --git a/ChangeLog b/ChangeLog
index 505936fd76f890873fd72e0ebda6c5d249906031..5129b859f988f7e3da3b82581d6c1f0bf995240a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-11-17  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaflowanalyzer.vala:
+
+       Fix control flow graph for try statements with finally clause,
+       fixes bug 561115
+
+2008-11-17  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valadynamicmethod.vala:
+       * vala/valadynamicsignal.vala:
+
+       Fix checking of dynamic methods and signals
+
 2008-11-17  Jürg Billeter  <j@bitron.ch>
 
        * vala/valafield.vala:

diff --git a/vala/valaflowanalyzer.vala b/vala/valaflowanalyzer.vala
index 84026cb75a74eb302bc857fa8bec4fe621cda1da..24fe771c05857446492c4d15034700f0b8c6f11f 100644 (file)
--- a/vala/valaflowanalyzer.vala
+++ b/vala/valaflowanalyzer.vala
@@ -952,6 +952,7 @@ public class Vala.FlowAnalyzer : CodeVisitor {
                        return;
                }
 
+               var before_try_block = current_block;
                var after_try_block = new BasicBlock ();
 
                BasicBlock finally_block = null;
@@ -982,6 +983,8 @@ public class Vala.FlowAnalyzer : CodeVisitor {
                        }
                }
 
+               current_block = before_try_block;
+
                stmt.body.accept (this);
 
                if (current_block != null) {