2002-01-24 Miguel de Icaza <miguel@ximian.com>

	* expression.cs (Invocation.EmitCall): Remove chunk of buggy
	code.  We should not use force into static mode if the method is
	not virtual.  Fixes bug in MIS

svn path=/trunk/mcs/; revision=2152

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 5c823bc3f73d7046c2338caf38d2f5a89a4ee5be..6c50c25cd1427142d8701be233c3ab3c596b8322 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,5 +1,9 @@
 2002-01-24  Miguel de Icaza  <miguel@ximian.com>
 
+       * expression.cs (Invocation.EmitCall): Remove chunk of buggy
+       code.  We should not use force into static mode if the method is
+       not virtual.  Fixes bug in MIS
+
        * statement.cs (Do.Emit, While.Emit, For.Emit,
        Statement.EmitBoolExpression): Add support to Do and While to
        propagate infinite loop as `I do return' semantics.

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 82d30b7cbf47ae4ed1ec1bac28e050192547804c..9f103e638a3fdd5634bb8af285fbdfc308f5477f 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -3455,12 +3455,24 @@ namespace Mono.CSharp {
                        if (Arguments != null)
                                EmitArguments (ec, method, Arguments);
 
+#if BLAH
                        if (method is MethodInfo){
                                MethodInfo mi = (MethodInfo) method;
 
                                if (!mi.IsVirtual)
                                        is_static = true;
                        }
+#endif
+
+                       bool debug = false;
+                       if (method.Name == "Send"){
+                               Console.WriteLine ("is_static: " + is_static);
+                               Console.WriteLine ("struct_call: " + struct_call);
+                               Console.WriteLine ("is_base: " + is_base);
+
+                               Console.WriteLine ("method: " + method.IsStatic);
+                               Console.WriteLine ("method: " + method);
+                       }
                        
                        if (is_static || struct_call || is_base){
                                if (method is MethodInfo)