From: Jürg Billeter <j@bitron.ch>
Date: Mon, 17 Nov 2008 21:20:31 +0000 (+0000)
Subject: Fix control flow graph for try statements with finally clause, fixes bug
X-Git-Tag: VALA_0_5_2~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e73a0050d724f476bb6faa1abdc2fdd45002f8e0;p=thirdparty%2Fvala.git

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 505936fd7..5129b859f 100644
--- 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 84026cb75..24fe771c0 100644
--- 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) {