Author: kumpera
Date: 2008-02-08 10:59:36 -0500 (Fri, 08 Feb 2008)
New Revision: 95268
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/verify.c
Log:
2008-02-08 Rodrigo Kumpera <[EMAIL PROTECTED]>
* verify.c (mono_type_get_stack_name): Added. Return the name for the
stack type of the given MonoType.
* verify.c (verify_type_compatibility_full): Handle the void type.
* verify.c (is_compatible_boxed_valuetype): Changed to fit the
way stack merging works.
* verify.c (store_local): Improved verification message.
* verify.c (do_branch_op): If the merging is invalid, the method
is unverifiable and not invalid. Improved error message.
* verify.c (merge_stacks): Properly merge a boxed valuetype and
a reference type diferent than System.Object. Improved error
message.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2008-02-08 15:49:02 UTC (rev 95267)
+++ trunk/mono/mono/metadata/ChangeLog 2008-02-08 15:59:36 UTC (rev 95268)
@@ -1,3 +1,22 @@
+2008-02-08 Rodrigo Kumpera <[EMAIL PROTECTED]>
+
+ * verify.c (mono_type_get_stack_name): Added. Return the name for the
+ stack type of the given MonoType.
+
+ * verify.c (verify_type_compatibility_full): Handle the void type.
+
+ * verify.c (is_compatible_boxed_valuetype): Changed to fit the
+ way stack merging works.
+
+ * verify.c (store_local): Improved verification message.
+
+ * verify.c (do_branch_op): If the merging is invalid, the method
+ is unverifiable and not invalid. Improved error message.
+
+ * verify.c (merge_stacks): Properly merge a boxed valuetype and
+ a reference type diferent than System.Object. Improved error
+ message.
+
2008-02-07 Rodrigo Kumpera <[EMAIL PROTECTED]>
* verify.c (mono_type_is_enum_type): Added. Test if a type is an enum.
Modified: trunk/mono/mono/metadata/verify.c
===================================================================
--- trunk/mono/mono/metadata/verify.c 2008-02-08 15:49:02 UTC (rev 95267)
+++ trunk/mono/mono/metadata/verify.c 2008-02-08 15:59:36 UTC (rev 95268)
@@ -132,6 +132,9 @@
static void
merge_stacks (VerifyContext *ctx, ILCodeDesc *from, ILCodeDesc *to, int start,
gboolean external);
+static int
+get_stack_type (MonoType *type);
+
//////////////////////////////////////////////////////////////////
@@ -258,6 +261,12 @@
return type;
}
+static const char*
+mono_type_get_stack_name (MonoType *type)
+{
+ return type_names [get_stack_type (type) & TYPE_MASK];
+}
+
#define CTOR_REQUIRED_FLAGS (METHOD_ATTRIBUTE_SPECIAL_NAME |
METHOD_ATTRIBUTE_RT_SPECIAL_NAME)
#define CTOR_INVALID_FLAGS (METHOD_ATTRIBUTE_STATIC)
@@ -2015,6 +2024,8 @@
handle_enum:
switch (target->type) {
+ case MONO_TYPE_VOID:
+ return candidate->type == MONO_TYPE_VOID;
case MONO_TYPE_I1:
case MONO_TYPE_U1:
case MONO_TYPE_BOOLEAN:
@@ -2154,12 +2165,22 @@
/*
* is_compatible_boxed_valuetype:
*
- * Returns TRUE if @candidate / @stack is a boxed valuetype and @type is
System.Object.
+ * Returns TRUE if @candidate / @stack is a valid boxed valuetype.
+ *
+ * @type The source type. It it tested to be of the proper type.
+ * @candidate type of the boxed valuetype.
+ * @stack stack slot of the boxed valuetype, separate from @candidade since
one could be changed before calling this function
+ * @type_must_be_object if TRUE @type must be System.Object, otherwise can be
any reference type.
+ *
*/
static gboolean
-is_compatible_boxed_valuetype (MonoType *type, MonoType *candidate,
ILStackDesc *stack)
+is_compatible_boxed_valuetype (MonoType *type, MonoType *candidate,
ILStackDesc *stack, gboolean type_must_be_object)
{
- return type->type == MONO_TYPE_OBJECT && !type->byref &&
mono_class_from_mono_type (candidate)->valuetype && !candidate->byref &&
stack_slot_is_boxed_value (stack);
+ if (type_must_be_object && type->type != MONO_TYPE_OBJECT)
+ return FALSE;
+ if (!type_must_be_object && !MONO_TYPE_IS_REFERENCE (type))
+ return FALSE;
+ return !type->byref && mono_class_from_mono_type (candidate)->valuetype
&& !candidate->byref && stack_slot_is_boxed_value (stack);
}
static int
@@ -2169,7 +2190,7 @@
if (MONO_TYPE_IS_REFERENCE (type) && !type->byref &&
stack_slot_is_null_literal (stack))
return TRUE;
- if (is_compatible_boxed_valuetype (type, candidate, stack))
+ if (is_compatible_boxed_valuetype (type, candidate, stack, TRUE))
return TRUE;
return verify_type_compatibility_full (ctx, type, candidate, FALSE);
@@ -2379,7 +2400,10 @@
if (check_underflow (ctx, 1)) {
value = stack_pop(ctx);
if (!verify_stack_type_compatibility (ctx, ctx->locals [arg],
value)) {
- CODE_NOT_VERIFIABLE (ctx, g_strdup_printf
("Incompatible type %s in local store at 0x%04x", stack_slot_get_name (value),
ctx->ip_offset));
+ CODE_NOT_VERIFIABLE (ctx, g_strdup_printf
("Incompatible type [%s], type [%s] was expected in local store at 0x%04x",
+ stack_slot_get_name (value),
+ mono_type_get_stack_name (ctx->locals
[arg]),
+ ctx->ip_offset));
}
}
}
@@ -2528,7 +2552,7 @@
VERIFIER_DEBUG ( printf ("idxa %d idxb %d\n", idxa, idxb); );
if (res == TYPE_INV) {
- ADD_VERIFY_ERROR (ctx,
+ CODE_NOT_VERIFIABLE (ctx,
g_strdup_printf ("Compare and Branch instruction
applyed to ill formed stack (%s x %s) at 0x%04x", stack_slot_get_name (a),
stack_slot_get_name (b), ctx->ip_offset));
} else if (res & NON_VERIFIABLE_RESULT) {
CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Compare and
Branch instruction is not verifiable (%s x %s) at 0x%04x", stack_slot_get_name
(a), stack_slot_get_name (b), ctx->ip_offset));
@@ -3796,12 +3820,12 @@
//No decent super type found, use object
match_class = mono_defaults.object_class;
goto match_found;
- } else if (is_compatible_boxed_valuetype (old_type, new_type,
new_slot) || is_compatible_boxed_valuetype (new_type, old_type, old_slot)) {
+ } else if (is_compatible_boxed_valuetype (old_type, new_type,
new_slot, FALSE) || is_compatible_boxed_valuetype (new_type, old_type,
old_slot, FALSE)) {
match_class = mono_defaults.object_class;
goto match_found;
}
- CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Could not merge
stacks, types not compatible at 0x%04x", ctx->ip_offset));
+ CODE_NOT_VERIFIABLE (ctx, g_strdup_printf ("Could not merge
stack at depth %d, types not compatible old [%s] new [%s] at 0x%04x", i,
stack_slot_get_name (old_slot), stack_slot_get_name (new_slot),
ctx->ip_offset));
goto end_verify;
match_found:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
