Author: zoltan
Date: 2005-04-16 11:54:50 -0400 (Sat, 16 Apr 2005)
New Revision: 43094
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/reflection.c
trunk/mono/mono/metadata/reflection.h
Log:
2005-04-16 Zoltan Varga <[EMAIL PROTECTED]>
* reflection.c reflection.h: Fix handling of parameter defaults in
dynamic
methods. Also fixes handling of parameter attributes. Fixes #74609.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-04-16 15:49:49 UTC (rev 43093)
+++ trunk/mono/mono/metadata/ChangeLog 2005-04-16 15:54:50 UTC (rev 43094)
@@ -1,3 +1,10 @@
+2005-04-16 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * reflection.c reflection.h: Fix handling of parameter defaults in
dynamic
+ methods. Also fixes handling of parameter attributes. Fixes #74609.
+
+ * mono-debug.c (mono_debug_close_image): Fix warning.
+
2005-04-15 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* socket-io.h: replaced old unused field with new 'blocking'.
Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c 2005-04-16 15:49:49 UTC (rev
43093)
+++ trunk/mono/mono/metadata/reflection.c 2005-04-16 15:54:50 UTC (rev
43094)
@@ -5757,8 +5757,10 @@
if (klass->image->dynamic) {
MonoReflectionMethodAux *aux = g_hash_table_lookup
(((MonoDynamicImage*)method->klass->image)->method_aux_hash, method);
- if (aux && aux->param_defaults)
+ if (aux && aux->param_defaults) {
memcpy (blobs, &(aux->param_defaults [1]),
methodsig->param_count * sizeof (char*));
+ memcpy (types, &(aux->param_default_types [1]),
methodsig->param_count * sizeof (guint32));
+ }
return;
}
@@ -7868,8 +7870,11 @@
for (i = 0; i <= m->signature->param_count; ++i) {
MonoReflectionParamBuilder *pb;
if ((pb = mono_array_get (rmb->pinfo,
MonoReflectionParamBuilder*, i))) {
- if (i > 0)
+ if ((i > 0) && (pb->attrs)) {
+ /* Make a copy since it might point to
a shared type structure */
+ m->signature->params [i - 1] = g_memdup
(m->signature->params [i - 1], sizeof (MonoType) + ((m->signature->params [i -
1]->num_mods - MONO_ZERO_LEN_ARRAY) * sizeof (MonoCustomMod)));
m->signature->params [i - 1]->attrs =
pb->attrs;
+ }
if (pb->def_value) {
MonoDynamicImage *assembly;
@@ -7877,8 +7882,10 @@
char *p;
const char *p2;
- if (!method_aux->param_defaults)
+ if (!method_aux->param_defaults) {
method_aux->param_defaults =
g_new0 (guint8*, m->signature->param_count + 1);
+ method_aux->param_default_types
= g_new0 (guint32, m->signature->param_count + 1);
+ }
assembly =
(MonoDynamicImage*)klass->image;
idx = encode_constant (assembly,
pb->def_value, &def_type);
/* Copy the data from the blob since it
might get realloc-ed */
@@ -7886,6 +7893,7 @@
len = mono_metadata_decode_blob_size
(p, &p2);
len += p2 - p;
method_aux->param_defaults [i] =
g_malloc (len);
+ method_aux->param_default_types [i] =
def_type;
memcpy
((gpointer)method_aux->param_defaults [i], p, len);
}
Modified: trunk/mono/mono/metadata/reflection.h
===================================================================
--- trunk/mono/mono/metadata/reflection.h 2005-04-16 15:49:49 UTC (rev
43093)
+++ trunk/mono/mono/metadata/reflection.h 2005-04-16 15:54:50 UTC (rev
43094)
@@ -35,6 +35,7 @@
MonoMarshalSpec **param_marshall;
MonoCustomAttrInfo **param_cattr;
guint8** param_defaults;
+ guint32 *param_default_types;
char *dllentry, *dll;
} MonoReflectionMethodAux;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches