2008-06-06 James Fitzsimons <james.fitzsimons@gmail.com>

[mono.git] / mcs / mcs / pending.cs

diff --git a/mcs/mcs/pending.cs b/mcs/mcs/pending.cs
index a8b486e36e32a73de354ffc8b4c45e4f101fc396..db89736ab5f92c631f3d091b12cd9a9a4e053c01 100644 (file)
--- a/mcs/mcs/pending.cs
+++ b/mcs/mcs/pending.cs
@@ -4,10 +4,10 @@
 // Author:
 //   Miguel de Icaza (miguel@gnu.org)
 //
-// Licensed under the terms of the GNU GPL
-//
-// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+// Dual licensed under the terms of the MIT X11 or GNU GPL
 //
+// Copyright 2001, 2002 Ximian, Inc (http://www.ximian.com)
+// Copyright 2003-2008 Novell, Inc.
 //
 
 using System;
@@ -546,17 +546,14 @@ namespace Mono.CSharp {
                        if (TypeManager.ImplementsInterface (container.TypeBuilder.BaseType, iface_type))
                                return true;
 
-                       //
-                       // FIXME: We should be creating fewer proxies.  The runtime can handle most cases.  
-                       //        At worst, if we can't avoid creating the proxy, we may need to make the 
-                       //        proxy use Callvirt.
-                       //
                        MethodInfo base_method = (MethodInfo) list [0];
 
                        if (base_method.DeclaringType.IsInterface)
                                return false;
 
                        if (!base_method.IsAbstract && !base_method.IsVirtual)
+                               // FIXME: We can avoid creating a proxy if base_method can be marked 'final virtual' instead.
+                               //        However, it's too late now, the MethodBuilder has already been created (see bug 377519)
                                DefineProxy (iface_type, base_method, mi, args);
 
                        return true;