Flush

[mono.git] / mcs / mcs / statement.cs

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index 9c023d287d4aaedd46e7edf65fe9f4a791f0d546..2cea11aa57686bb27b433cef12d852779a5040c4 100644 (file)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -2346,6 +2346,11 @@ namespace Mono.CSharp {
                {
                        MutateVariables (storey);
 
+                       if (scope_initializers != null) {
+                               foreach (Statement s in scope_initializers)
+                                       s.MutateHoistedGenericType (storey);
+                       }
+
                        foreach (Statement s in statements)
                                s.MutateHoistedGenericType (storey);
                }
@@ -3653,7 +3658,7 @@ namespace Mono.CSharp {
                                new QualifiedAliasMember (QualifiedAliasMember.GlobalAlias, "System", loc), "Collections", loc), "Generic", loc);
 
                        string_dictionary_type = new MemberAccess (system_collections_generic, "Dictionary",
-                               new TypeArguments (loc,
+                               new TypeArguments (
                                        new TypeExpression (TypeManager.string_type, loc),
                                        new TypeExpression (TypeManager.int32_type, loc)), loc);
 #else
@@ -5100,7 +5105,7 @@ namespace Mono.CSharp {
 
                                public void ResolveIncrement (EmitContext ec)
                                {
-                                       increment = new StatementExpression (new UnaryMutator (UnaryMutator.Mode.PostIncrement, this, loc));
+                                       increment = new StatementExpression (new UnaryMutator (UnaryMutator.Mode.PostIncrement, this));
                                        increment.Resolve (ec);
                                }