Fixes cloning of a variable declarator.

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

diff --git a/mcs/mcs/rootcontext.cs b/mcs/mcs/rootcontext.cs
index 3d3e7dde9ac226c3835914f30ac317bd2ba6016d..8ee0ce47a95f61bdac7dd8f8a4b3e85c78e0bb82 100644 (file)
--- a/mcs/mcs/rootcontext.cs
+++ b/mcs/mcs/rootcontext.cs
@@ -248,6 +248,12 @@ namespace Mono.CSharp {
                        args[2] = TypeManager.enum_type.GetMetaInfo ();
                        args[3] = TypeManager.void_type.GetMetaInfo ();
                        set_corlib_type_builders.Invoke (CodeGen.Assembly.Builder, args);
+               }
+
+               static void HackCorlibEnums ()
+               {
+                       if (StdLib)
+                               return;
 
                        // Another Mono corlib HACK
                        // mono_class_layout_fields requires to have enums created
@@ -266,9 +272,9 @@ namespace Mono.CSharp {
                //   methods, fields, etc) we need to "Define" them before we
                //   can save the Assembly
                // </remarks>
-               static public void CloseTypes ()
+               static public void CloseTypes (CompilerContext ctx)
                {
-                       HackCorlib ();
+                       HackCorlibEnums ();
 
                        foreach (TypeContainer tc in root.Types){
                                tc.CloseType ();
@@ -282,8 +288,9 @@ namespace Mono.CSharp {
                        // If we have a <PrivateImplementationDetails> class, close it
                        //
                        if (helper_classes != null){
+                               var cg = ctx.PredefinedAttributes.CompilerGenerated;
                                foreach (TypeBuilder type_builder in helper_classes) {
-                                       PredefinedAttributes.Get.CompilerGenerated.EmitAttribute (type_builder);
+                                       cg.EmitAttribute (type_builder);
                                        type_builder.CreateType ();
                                }
                        }
@@ -328,6 +335,8 @@ namespace Mono.CSharp {
                        foreach (var tc in ToplevelTypes.Types)
                                tc.DefineConstants ();
 
+                       HackCorlib ();
+
                        foreach (TypeContainer tc in ToplevelTypes.Types)
                                tc.EmitType ();