[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r61355 - trunk/mono/mono/metadata
From:       "Zoltan Varga (vargaz AT gmail.com)" <mono-patches-list () lists ! ximian ! com>
Date:       2006-05-31 20:55:44
Message-ID: 20060531205544.813A29472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: zoltan
Date: 2006-05-31 16:55:44 -0400 (Wed, 31 May 2006)
New Revision: 61355

Modified:
   trunk/mono/mono/metadata/class-internals.h
   trunk/mono/mono/metadata/loader.c
   trunk/mono/mono/metadata/reflection.c
Log:
2006-05-31  Zoltan Varga  <vargaz@gmail.com>

	* class-internals.h (MonoClass): Removed obsolete 'dummy' flag.

	* reflection.c loader.c: Removed references to 'dummy' flag.

	* loader.c (mono_loader_error_prepare_exception): Fix a warning.


Modified: trunk/mono/mono/metadata/class-internals.h
===================================================================
--- trunk/mono/mono/metadata/class-internals.h	2006-05-31 20:48:47 UTC (rev 61354)
+++ trunk/mono/mono/metadata/class-internals.h	2006-05-31 20:55:44 UTC (rev 61355)
@@ -260,9 +260,8 @@
 	guint delegate        : 1; /* class is a Delegate */
 	guint gc_descr_inited : 1; /* gc_descr is initialized */
 	guint has_cctor       : 1; /* class has a cctor */
-	guint dummy           : 1; /* temporary hack */
-	/* next byte */
 	guint has_references  : 1; /* it has GC-tracked references in the instance */
+	/* next byte */
 	guint has_static_refs : 1; /* it has static fields that are GC-tracked */
 	guint no_special_static_fields : 1; /* has no thread/context static fields */
 

Modified: trunk/mono/mono/metadata/loader.c
===================================================================
--- trunk/mono/mono/metadata/loader.c	2006-05-31 20:48:47 UTC (rev 61354)
+++ trunk/mono/mono/metadata/loader.c	2006-05-31 20:55:44 UTC (rev 61355)
@@ -219,10 +219,9 @@
         case MONO_LOADER_ERROR_METHOD: {
 		char *cname = g_strdup (error->class_name);
 		char *aname = g_strdup (error->member_name);
-		MonoString *class_name;
 		
 		mono_loader_clear_error ();
-                ex = mono_get_exception_missing_method (cname, aname);
+		ex = mono_get_exception_missing_method (cname, aname);
 		g_free (cname);
 		g_free (aname);
 		break;
@@ -1312,7 +1311,7 @@
 	}
 
 	/* FIXME: lazyness for generics too, but how? */
-	if (!result->klass->dummy && !(result->flags & METHOD_ATTRIBUTE_ABSTRACT) &&
+	if (!(result->flags & METHOD_ATTRIBUTE_ABSTRACT) &&
 	    !(cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
 	    !(result->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) && container) {
 		gpointer loc = mono_image_rva_map (image, cols [0]);
@@ -1834,7 +1833,7 @@
 	gpointer loc;
 	MonoMethodNormal* mn = (MonoMethodNormal*) method;
 
-	if (method->klass->dummy || (method->flags & METHOD_ATTRIBUTE_ABSTRACT) || \
(method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) || (method->iflags & \
METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || (method->flags & \
METHOD_ATTRIBUTE_PINVOKE_IMPL)) +	if ((method->flags & METHOD_ATTRIBUTE_ABSTRACT) || \
(method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) || (method->iflags & \
METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || (method->flags & \
METHOD_ATTRIBUTE_PINVOKE_IMPL))  return NULL;
 
 #ifdef G_LIKELY

Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c	2006-05-31 20:48:47 UTC (rev 61354)
+++ trunk/mono/mono/metadata/reflection.c	2006-05-31 20:55:44 UTC (rev 61355)
@@ -8415,8 +8415,7 @@
 		mono_loader_unlock ();
 
 		return m;
-	} else if (!m->klass->dummy && 
-			   !(m->flags & METHOD_ATTRIBUTE_ABSTRACT) &&
+	} else if (!(m->flags & METHOD_ATTRIBUTE_ABSTRACT) &&
 			   !(m->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
 		MonoMethodHeader *header;
 		guint32 code_size;

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]