Don't resolve partial method default parameters twice

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

diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
index 6a66670658fbcc0450f2db1af48dff1b33be8b89..f4f7181a47874eec7d0217807a120af69f747023 100644 (file)
--- a/mcs/mcs/class.cs
+++ b/mcs/mcs/class.cs
@@ -256,7 +256,14 @@ namespace Mono.CSharp
                {
                        if (containers != null) {
                                foreach (var t in containers) {
-                                       t.PrepareEmit ();
+                                       try {
+                                               t.PrepareEmit ();
+                                       } catch (Exception e) {
+                                               if (MemberName == MemberName.Null)
+                                                       throw;
+
+                                               throw new InternalErrorException (t, e);
+                                       }
                                }
                        }
                }
@@ -1492,6 +1499,9 @@ namespace Mono.CSharp
 
                public override void PrepareEmit ()
                {
+                       if ((caching_flags & Flags.CloseTypeCreated) != 0)
+                               return;
+
                        foreach (var member in members) {
                                var pm = member as IParametersMember;
                                if (pm != null) {