[mcs] Adds workaround for repl enum declaration on .net SRE

diff --git a/mcs/mcs/enum.cs b/mcs/mcs/enum.cs
index 3e1c3fc653091cd47f86df6b839d92c96a296127..8a2884023300f0e50657440dc14f89829759a0d2 100644 (file)
--- a/mcs/mcs/enum.cs
+++ b/mcs/mcs/enum.cs
@@ -22,10 +22,29 @@ using MetaType = System.Type;
 using System.Reflection;
 #endif
 
-namespace Mono.CSharp {
+namespace Mono.CSharp
+{
 
        public class EnumMember : Const
        {
+#if !STATIC
+               class MemberTypeDelegator : TypeDelegator
+               {
+                       Type underlyingType;
+
+                       public MemberTypeDelegator (Type delegatingType, Type underlyingType)
+                               : base (delegatingType)
+                       {
+                               this.underlyingType = underlyingType;
+                       }
+
+                       public override Type GetEnumUnderlyingType ()
+                       {
+                               return underlyingType;
+                       }
+               }
+#endif
+
                class EnumTypeExpr : TypeExpr
                {
                        public override TypeSpec ResolveAsType (IMemberContext ec, bool allowUnboundTypeArguments)
@@ -85,8 +104,17 @@ namespace Mono.CSharp {
                        if (!ResolveMemberType ())
                                return false;
 
+                       MetaType ftype = MemberType.GetMetaInfo ();
+#if !STATIC
+                       //
+                       // Workaround for .net SRE limitation which cannot define field of unbaked enum type
+                       // which is how all enums are declared
+                       //
+                       ftype = new MemberTypeDelegator (ftype, ((Enum)Parent).UnderlyingType.GetMetaInfo ());
+#endif
+
                        const FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static | FieldAttributes.Literal;
-                       FieldBuilder = Parent.TypeBuilder.DefineField (Name, MemberType.GetMetaInfo (), attr);
+                       FieldBuilder = Parent.TypeBuilder.DefineField (Name, ftype, attr);
                        spec = new ConstSpec (Parent.Definition, this, MemberType, FieldBuilder, ModFlags, initializer);
 
                        Parent.MemberCache.AddMember (spec);