vala r2028 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Mon Nov 17 21:20:31 2008
New Revision: 2028
URL: http://svn.gnome.org/viewvc/vala?rev=2028&view=rev

Log:
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


Modified:
   trunk/ChangeLog
   trunk/vala/valaflowanalyzer.vala

Modified: trunk/vala/valaflowanalyzer.vala
==============================================================================
--- trunk/vala/valaflowanalyzer.vala	(original)
+++ trunk/vala/valaflowanalyzer.vala	Mon Nov 17 21:20:31 2008
@@ -952,6 +952,7 @@
 			return;
 		}
 
+		var before_try_block = current_block;
 		var after_try_block = new BasicBlock ();
 
 		BasicBlock finally_block = null;
@@ -982,6 +983,8 @@
 			}
 		}
 
+		current_block = before_try_block;
+
 		stmt.body.accept (this);
 
 		if (current_block != null) {