Permalink
Browse files

2006-10-12 Martin Baulig <martin@ximian.com>

	* statement.cs
	(Using.EmitLocalVariableDeclFinally): Small fix for iterators.


svn path=/trunk/mcs/; revision=66608
  • Loading branch information...
1 parent 09fb58c commit 9bd0415d5fcd10d82e081067b1f4221179708b67 Martin Baulig committed Oct 12, 2006
Showing with 9 additions and 3 deletions.
  1. +5 −0 mcs/mcs/ChangeLog
  2. +4 −3 mcs/mcs/statement.cs
View
@@ -1,3 +1,8 @@
+2006-10-12 Martin Baulig <martin@ximian.com>
+
+ * statement.cs
+ (Using.EmitLocalVariableDeclFinally): Small fix for iterators.
+
2006-10-11 Miguel de Icaza <miguel@novell.com>
* convert.cs: Remove broken code: I was doing the "Existance"
View
@@ -4308,8 +4308,9 @@ void EmitLocalVariableDeclFinally (EmitContext ec)
for (int ii = 0; ii < var_list.Count; ++ii){
Expression var = resolved_vars [--i];
Label skip = ig.DefineLabel ();
-
- ig.BeginFinallyBlock ();
+
+ if (emit_finally)
+ ig.BeginFinallyBlock ();
if (!var.Type.IsValueType) {
var.Emit (ec);
@@ -4445,7 +4446,7 @@ public override bool Resolve (EmitContext ec)
return false;
}
- ResolveFinally (branching);
+ ResolveFinally (branching);
FlowBranching.Reachability reachability = ec.EndFlowBranching ();
if (!reachability.AlwaysReturns) {

0 comments on commit 9bd0415

Please sign in to comment.