From: Rodrigo Kumpera <kumpera@gmail.com>
Date: Mon, 9 Jun 2008 14:16:35 +0000 (-0000)
Subject: 2008-06-09 Rodrigo Kumpera  <rkumpera@novell.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=6374cfd398dcc86a29a096b6e09c23aebc639516;p=mono.git

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 d28192e6f6b..18dd9d19e73 100644
--- 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 fd59a610232..5cd095408cf 100644
--- 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) {