2005-06-07 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
old mode 100755 (executable)
new mode 100644 (file)
index eb58c5e..d08d1cb
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -38,6 +38,7 @@ using System.Security;
 using System.Security.Permissions;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Diagnostics.SymbolStore;
 
 namespace System.Reflection.Emit {
 
@@ -57,7 +58,8 @@ namespace System.Reflection.Emit {
                private MethodInfo override_method;
                private string pi_dll;
                private string pi_entry;
-               private CharSet ncharset; /* this also encodes set_last_error etc */
+               private CharSet charset;
+               private uint extra_flags; /* this encodes set_last_error etc */
                private CallingConvention native_cc;
                private CallingConventions call_conv;
                private bool init_locals = true;
@@ -87,6 +89,10 @@ namespace System.Reflection.Emit {
                        if ((attributes & MethodAttributes.Static) == 0)
                                this.call_conv |= CallingConventions.HasThis;
                        if (parameterTypes != null) {
+                               for (int i = 0; i < parameterTypes.Length; ++i)
+                                       if (parameterTypes [i] == null)
+                                               throw new ArgumentException ("Elements of the parameterTypes array cannot be null", "parameterTypes");
+
                                this.parameters = new Type [parameterTypes.Length];
                                System.Array.Copy (parameterTypes, this.parameters, parameterTypes.Length);
                        }
@@ -102,7 +108,7 @@ namespace System.Reflection.Emit {
                        pi_dll = dllName;
                        pi_entry = entryName;
                        native_cc = nativeCConv;
-                       ncharset = nativeCharset;
+                       charset = nativeCharset;
                }
 
                public bool InitLocals {
@@ -143,14 +149,28 @@ namespace System.Reflection.Emit {
                /* Used by mcs */
                internal bool BestFitMapping {
                        set {
-                               ncharset = (CharSet)(((int)ncharset & ~0x30) | (value ? 0x10 : 0x20));
+                               extra_flags = (uint) ((extra_flags & ~0x30) | (value ? 0x10 : 0x20));
                        }
                }
 
                /* Used by mcs */
                internal bool ThrowOnUnmappableChar {
                        set {
-                               ncharset = (CharSet)(((int)ncharset & ~0x3000) | (value ? 0x1000 : 0x2000));
+                               extra_flags = (uint) ((extra_flags & ~0x3000) | (value ? 0x1000 : 0x2000));
+                       }
+               }
+
+               /* Used by mcs */
+               internal bool ExactSpelling {
+                       set {
+                               extra_flags = (uint) ((extra_flags & ~0x01) | (value ? 0x01 : 0x00));
+                       }
+               }
+
+               /* Used by mcs */
+               internal bool SetLastError {
+                       set {
+                               extra_flags = (uint) ((extra_flags & ~0x40) | (value ? 0x40 : 0x00));
                        }
                }
 
@@ -251,12 +271,23 @@ namespace System.Reflection.Emit {
 
                internal void fixup () {
                        if (((attrs & (MethodAttributes.Abstract | MethodAttributes.PinvokeImpl)) == 0) && ((iattrs & (MethodImplAttributes.Runtime | MethodImplAttributes.InternalCall)) == 0)) {
-                               if ((ilgen == null) || (ILGenerator.Mono_GetCurrentOffset (ilgen) == 0))
+                               if (((ilgen == null) || (ILGenerator.Mono_GetCurrentOffset (ilgen) == 0)) && (code == null))
                                        throw new InvalidOperationException ("Method '" + Name + "' does not have a method body.");
                        }
                        if (ilgen != null)
                                ilgen.label_fixup ();
                }
+               
+               internal void GenerateDebugInfo (ISymbolWriter symbolWriter)
+               {
+                       if (ilgen != null && ilgen.HasDebugInfo) {
+                               SymbolToken token = new SymbolToken (GetToken().Token);
+                               symbolWriter.OpenMethod (token);
+                               symbolWriter.SetSymAttribute (token, "__name", System.Text.Encoding.UTF8.GetBytes (Name));
+                               ilgen.GenerateDebugInfo (symbolWriter);
+                               symbolWriter.CloseMethod ();
+                       }
+               }
 
                public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
                        if (customBuilder == null)
@@ -270,6 +301,53 @@ namespace System.Reflection.Emit {
                                SetImplementationFlags ((MethodImplAttributes)impla);
                                return;
                        }
+                       if (attrname == "System.Runtime.InteropServices.DllImportAttribute") {
+                               CustomAttributeBuilder.CustomAttributeInfo attr = CustomAttributeBuilder.decode_cattr (customBuilder);
+                               bool preserveSig = true;
+
+                               /*
+                                * It would be easier to construct a DllImportAttribute from
+                                * the custom attribute builder, but the DllImportAttribute 
+                                * does not contain all the information required here, ie.
+                                * - some parameters, like BestFitMapping has three values
+                                *   ("on", "off", "missing"), but DllImportAttribute only
+                                *   contains two (on/off).
+                                * - PreserveSig is true by default, while it is false by
+                                *   default in DllImportAttribute.
+                                */
+
+                               pi_dll = (string)attr.ctorArgs [0];
+                               native_cc = System.Runtime.InteropServices.CallingConvention.Winapi;
+
+                               for (int i = 0; i < attr.namedParamNames.Length; ++i) {
+                                       string name = attr.namedParamNames [i];
+                                       object value = attr.namedParamValues [i];
+
+                                       if (name == "CallingConvention")
+                                               native_cc = (CallingConvention)value;
+                                       else if (name == "CharSet")
+                                               charset = (CharSet)value;
+                                       else if (name == "EntryPoint")
+                                               pi_entry = (string)value;
+                                       else if (name == "ExactSpelling")
+                                               ExactSpelling = (bool)value;
+                                       else if (name == "SetLastError")
+                                               SetLastError = (bool)value;
+                                       else if (name == "PreserveSig")
+                                               preserveSig = (bool)value;
+#if NET_1_1
+                                       else if (name == "BestFitMapping")
+                                               BestFitMapping = (bool)value;
+                                       else if (name == "ThrowOnUnmappableChar")
+                                               ThrowOnUnmappableChar = (bool)value;
+#endif
+                               }
+
+                               attrs |= MethodAttributes.PinvokeImpl;
+                               if (preserveSig)
+                                       iattrs |= MethodImplAttributes.PreserveSig;
+                               return;
+                       }
                        if (cattrs != null) {
                                CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
                                cattrs.CopyTo (new_array, 0);
@@ -319,7 +397,9 @@ namespace System.Reflection.Emit {
                        attrs |= MethodAttributes.HasSecurity;
                }
 
-               [MonoTODO]
+#if NET_2_0
+               [Obsolete ("An alternate API is available: Emit the MarshalAs custom attribute instead.")]
+#endif
                public void SetMarshal (UnmanagedMarshal unmanagedMarshal)
                {
                        RejectIfCreated ();