Wed Jul 31 14:29:43 CEST 2002 Paolo Molaro <lupus@ximian.com>

	* interp.c: fix so that mint can at least get to executing Main().

svn path=/trunk/mono/; revision=6283

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index 56e0f7a60d25639363236a2982ddff2bd6feab7b..0b07c17d79a60924d772605a263589e48775401c 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,8 @@
+
+Wed Jul 31 14:29:43 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+       * interp.c: fix so that mint can at least get to executing Main().
+
 2002-07-31  Dietmar Maurer  <dietmar@ximian.com>
 
        * interp.c: use the new marshaling code. better delegate/remoting 

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 8dfdeb66cfe3d430d0edab827a419edd426546f5..8c80d7fc638d9659c555052243bf1a6bc7b1deb5 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -1283,14 +1283,6 @@ ves_exec_method (MonoInvocation *frame)
 
        DEBUG_ENTER ();
 
-       if (frame->method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
-               ves_runtime_method (frame);
-               if (frame->ex)
-                       goto handle_exception;
-               DEBUG_LEAVE ();
-               return;
-       } 
-
        if (frame->method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
                if (!frame->method->addr) {
                        if (!mono_lookup_pinvoke_call (frame->method)) {
@@ -1306,6 +1298,13 @@ ves_exec_method (MonoInvocation *frame)
                return;
        } 
 
+       if (frame->method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
+               ves_runtime_method (frame);
+               if (frame->ex)
+                       goto handle_exception;
+               DEBUG_LEAVE ();
+               return;
+       } 
 
        /*verify_method (frame->method);*/