Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / corlib / System.Reflection.Emit / FieldBuilder.cs

diff --git a/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs
index fb78f7f64d2b2a7f265a32d1700a508739898a1c..053d8c831e4d05ea750b5b98b6324e0bb84d254f 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs
@@ -31,6 +31,7 @@
 // (C) 2001-2002 Ximian, Inc.  http://www.ximian.com
 //
 
+#if !FULL_AOT_RUNTIME
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -39,12 +40,13 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace System.Reflection.Emit {
-#if NET_2_0
        [ComVisible (true)]
        [ComDefaultInterface (typeof (_FieldBuilder))]
-#endif
        [ClassInterface (ClassInterfaceType.None)]
+       [StructLayout (LayoutKind.Sequential)]
        public sealed class FieldBuilder : FieldInfo, _FieldBuilder {
+       
+#pragma warning disable 169, 414
                private FieldAttributes attrs;
                private Type type;
                private String name;
@@ -58,8 +60,13 @@ namespace System.Reflection.Emit {
                private RuntimeFieldHandle handle;
                private Type[] modReq;
                private Type[] modOpt;
+#pragma warning restore 169, 414
+
+               internal FieldBuilder (TypeBuilder tb, string fieldName, Type type, FieldAttributes attributes, Type[] modReq, Type[] modOpt)
+               {
+                       if (type == null)
+                               throw new ArgumentNullException ("type");
 
-               internal FieldBuilder (TypeBuilder tb, string fieldName, Type type, FieldAttributes attributes, Type[] modReq, Type[] modOpt) {
                        attrs = attributes;
                        name = fieldName;
                        this.type = type;
@@ -68,6 +75,8 @@ namespace System.Reflection.Emit {
                        offset = -1;
                        typeb = tb;
                        table_idx = tb.get_next_table_index (this, 0x04, true);
+
+                       ((ModuleBuilder) tb.Module).RegisterToken (this, GetToken ().Token);
                }
 
                public override FieldAttributes Attributes {
@@ -116,7 +125,7 @@ namespace System.Reflection.Emit {
                }
 
                public FieldToken GetToken() {
-                       return new FieldToken (0x04000000 | table_idx);
+                       return new FieldToken (MetadataToken);
                }
 
                public override object GetValue(object obj) {
@@ -158,11 +167,9 @@ namespace System.Reflection.Emit {
                        } else if (attrname == "System.NonSerializedAttribute") {
                                attrs |= FieldAttributes.NotSerialized;
                                return;
-#if NET_2_0
                        } else if (attrname == "System.Runtime.CompilerServices.SpecialNameAttribute") {
                                attrs |= FieldAttributes.SpecialName;
                                return;
-#endif
                        } else if (attrname == "System.Runtime.InteropServices.MarshalAsAttribute") {
                                attrs |= FieldAttributes.HasFieldMarshal;
                                marshal_info = CustomAttributeBuilder.get_umarshal (customBuilder, true);
@@ -180,17 +187,13 @@ namespace System.Reflection.Emit {
                        }
                }
 
-#if NET_2_0
                [ComVisible (true)]
-#endif
                public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
                        RejectIfCreated ();
                        SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
                }
 
-#if NET_2_0
                [Obsolete ("An alternate API is available: Emit the MarshalAs custom attribute instead.")]
-#endif
                public void SetMarshal( UnmanagedMarshal unmanagedMarshal) {
                        RejectIfCreated ();
                        marshal_info = unmanagedMarshal;
@@ -206,12 +209,6 @@ namespace System.Reflection.Emit {
                        throw CreateNotSupportedException ();
                }
 
-               internal override UnmanagedMarshal UMarshal {
-                       get {
-                               return marshal_info;
-                       }
-               }
-
                private Exception CreateNotSupportedException ()
                {
                        return new NotSupportedException ("The invoked member is not supported in a dynamic module.");
@@ -223,18 +220,11 @@ namespace System.Reflection.Emit {
                                throw new InvalidOperationException ("Unable to change after type has been created.");
                }
 
-#if NET_2_0 || BOOTSTRAP_NET_2_0
-               public override FieldInfo Mono_GetGenericFieldDefinition ()
-               {
-                       return this;
-               }
-
                public override Module Module {
                        get {
                                return base.Module;
                        }
                }
-#endif
 
                void _FieldBuilder.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
                {
@@ -258,3 +248,4 @@ namespace System.Reflection.Emit {
        }
 }
 
+#endif