2008-06-09 Rodrigo Kumpera <rkumpera@novell.com>

	* verify.c: Reapplied more of the reverted changes.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index d28192e6f6be5e6a64d153bb855475cdaa8e62aa..18dd9d19e738704ec17b19c381adfcadf5ff36df 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-09 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * verify.c: Reapplied more of the reverted changes.
+
 2008-06-09  Martin Baulig  <martin@ximian.com>
 
        * debug-mono-symfile.c (load_symfile): Check the major version

diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index fd59a610232e64c6bcecc8d49e3aabb26e86fa02..5cd095408cf754741527e0418e54104fd96fd5c1 100644 (file)
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -1688,7 +1688,7 @@ stack_push_val (VerifyContext *ctx, int stype, MonoType *type)
        return top;
 }
 
-ILStackDesc *
+static ILStackDesc *
 stack_pop (VerifyContext *ctx)
 {
        return ctx->eval.stack + --ctx->eval.size;;
@@ -5400,10 +5400,8 @@ mono_method_verify (MonoMethod *method, int level)
                        CODE_NOT_VERIFIABLE (&ctx, g_strdup_printf ("Invalid call to a non-final virtual function in method with stdarg.0 or ldarga.0 at  0x%04x", i));
        }
 
-       /*
        if (mono_method_is_constructor (ctx.method) && !ctx.super_ctor_called && !ctx.method->klass->valuetype && ctx.method->klass != mono_defaults.object_class)
                CODE_NOT_VERIFIABLE (&ctx, g_strdup_printf ("Constructor not calling super\n"));
-       */
 
        if (ctx.code) {
                for (i = 0; i < ctx.header->code_size; ++i) {