New test.

[mono.git] / mcs / ilasm / codegen / MethodRef.cs

diff --git a/mcs/ilasm/codegen/MethodRef.cs b/mcs/ilasm/codegen/MethodRef.cs
index fdcfeca128b449a3c65313e8a5818e601d401e01..5c0553febf0424ae80cc9d05006118c9840ab77c 100644 (file)
--- a/mcs/ilasm/codegen/MethodRef.cs
+++ b/mcs/ilasm/codegen/MethodRef.cs
@@ -26,9 +26,11 @@ namespace Mono.ILASM {
                         if (is_resolved)
                                 return;
 
+                       owner.Resolve (code_gen);
+
                         TypeDef owner_def = code_gen.TypeManager[owner.FullName];
                        if (owner_def == null)
-                               throw new Exception (String.Format ("Reference to undefined class '{0}'", owner.FullName));
+                               Report.Error ("Reference to undefined class '" + owner.FullName + "'");
 
                         string write_name;
 
@@ -37,13 +39,10 @@ namespace Mono.ILASM {
                         else
                                 write_name = name;
 
-                        string sig;
-
                         if ((call_conv & PEAPI.CallConv.Vararg) == 0) {
-                                sig = MethodDef.CreateSignature (ret_type, name, param, gen_param_count);
-                                peapi_method = owner_def.ResolveMethod (sig, code_gen);
+                                peapi_method = owner_def.ResolveMethod (ret_type, call_conv, name, 
+                                        param, gen_param_count, code_gen);
                         } else {
-                                sig = MethodDef.CreateVarargSignature (ret_type, name, param);
                                 ArrayList opt_list = new ArrayList ();
                                 bool in_opt = false;
                                 foreach (BaseTypeRef type in param) {
@@ -54,8 +53,10 @@ namespace Mono.ILASM {
                                                 opt_list.Add (type.PeapiType);
                                         }
                                 }
-                                peapi_method = owner_def.ResolveVarargMethod (sig, code_gen,
-                                                (PEAPI.Type[]) opt_list.ToArray (typeof (PEAPI.Type)));
+                                peapi_method = owner_def.ResolveVarargMethod (
+                                                ret_type, call_conv, name, param, gen_param_count,
+                                                (PEAPI.Type[]) opt_list.ToArray (typeof (PEAPI.Type)),
+                                                code_gen);
                         }
 
                         is_resolved = true;