Merge pull request #485 from mtausig/master

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs b/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs
index 9af56018aa1a31f36294d099e51bbf0676622662..5378f7e2a01ac831793cfaef65d451e912c46b6d 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/DynamicMethod.cs
@@ -42,9 +42,10 @@ using System.Runtime.InteropServices;
 namespace System.Reflection.Emit {
 
        [ComVisible (true)]
+       [StructLayout (LayoutKind.Sequential)]
        public sealed class DynamicMethod : MethodInfo {
 
-#pragma warning disable 169, 414
+#pragma warning disable 169, 414, 649
                #region Sync with reflection.h
                private RuntimeMethodHandle mhandle;
                private string name;
@@ -61,12 +62,13 @@ namespace System.Reflection.Emit {
                private IntPtr referenced_by;
                private Type owner;
                #endregion
-#pragma warning restore 169, 414
+#pragma warning restore 169, 414, 649
                
                private Delegate deleg;
                private MonoMethod method;
                private ParameterBuilder[] pinfo;
                internal bool creating;
+               private DynamicILInfo il_info;
 
                public DynamicMethod (string name, Type returnType, Type[] parameterTypes, Module m) : this (name, returnType, parameterTypes, m, false) {
                }
@@ -110,9 +112,12 @@ namespace System.Reflection.Emit {
                                        if (parameterTypes [i] == null)
                                                throw new ArgumentException ("Parameter " + i + " is null", "parameterTypes");
                        }
+                       if (owner != null && (owner.IsArray || owner.IsInterface)) {
+                               throw new ArgumentException ("Owner can't be an array or an interface.");
+                       }
 
                        if (m == null)
-                               m = AnonHostModuleHolder.anon_host_module;
+                               m = AnonHostModuleHolder.AnonHostModule;
 
                        this.name = name;
                        this.attributes = attributes | MethodAttributes.Static;
@@ -127,9 +132,6 @@ namespace System.Reflection.Emit {
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern void create_dynamic_method (DynamicMethod m);
 
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern void destroy_dynamic_method (DynamicMethod m);
-
                private void CreateDynMethod () {
                        if (mhandle.Value == IntPtr.Zero) {
                                if (ilgen == null || ilgen.ILOffset == 0)
@@ -158,11 +160,6 @@ namespace System.Reflection.Emit {
                        }
                }
 
-               ~DynamicMethod ()
-               {
-                       destroy_dynamic_method (this);
-               }
-
                [ComVisible (true)]
                public Delegate CreateDelegate (Type delegateType)
                {
@@ -221,9 +218,10 @@ namespace System.Reflection.Emit {
                        throw new NotImplementedException ();
                }
 
-               [MonoTODO("Not implemented")]
                public DynamicILInfo GetDynamicILInfo () {
-                       throw new NotImplementedException ();
+                       if (il_info == null)
+                               il_info = new DynamicILInfo (this);
+                       return il_info;
                }
 
                public ILGenerator GetILGenerator () {
@@ -262,6 +260,10 @@ namespace System.Reflection.Emit {
                        return parameters == null ? 0 : parameters.Length;
                }               
 
+               internal override Type GetParameterType (int pos) {
+                       return parameters [pos];
+               }
+
                /*
                public override object Invoke (object obj, object[] parameters) {
                        CreateDynMethod ();
@@ -413,6 +415,12 @@ namespace System.Reflection.Emit {
 
                                anon_host_module = ab.GetManifestModule ();
                        }
+
+                       public static Module AnonHostModule {
+                               get {
+                                       return anon_host_module;
+                               }
+                       }
                }
        }