Merge pull request #1659 from alexanderkyte/stringbuilder-referencesource

[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
index 1beb945a8d2082f067cc8896042ddfc7df8da347..97e6fd81b93299261db7512e638eecac33600249 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -219,17 +219,23 @@ namespace System.Reflection.Emit
                {
                        if (!type.is_created)
                                throw NotSupported ();
+
+                       return GetParametersInternal ();
+               }
+
+               internal override ParameterInfo[] GetParametersInternal ()
+               {
                        if (parameters == null)
                                return null;
 
                        ParameterInfo[] retval = new ParameterInfo [parameters.Length];
                        for (int i = 0; i < parameters.Length; i++) {
-                               retval [i] = new ParameterInfo (pinfo == null ? null : pinfo [i + 1], parameters [i], this, i + 1);
+                               retval [i] = ParameterInfo.New (pinfo == null ? null : pinfo [i + 1], parameters [i], this, i + 1);
                        }
                        return retval;
                }
                
-               internal override int GetParameterCount ()
+               internal override int GetParametersCount ()
                {
                        if (parameters == null)
                                return 0;
@@ -348,7 +354,7 @@ namespace System.Reflection.Emit
                                                                                            DeclaringType.FullName, Name));
                        }
                        if (ilgen != null)
-                               ilgen.label_fixup ();
+                               ilgen.label_fixup (this);
                }
                
                internal void GenerateDebugInfo (ISymbolWriter symbolWriter)
@@ -649,7 +655,7 @@ namespace System.Reflection.Emit
 
                public override Module Module {
                        get {
-                               return base.Module;
+                               return GetModule ();
                        }
                }
 
@@ -673,11 +679,9 @@ namespace System.Reflection.Emit
                        throw new NotImplementedException ();
                }
 
-#if NET_4_0
                public override ParameterInfo ReturnParameter {
                        get { return base.ReturnParameter; }
                }
-#endif
        }
 }
 #endif