Compare commits

...
Author SHA1 Message Date
Zoltan Varga 51a238609c Revert "Merge branch 'master-2.6' into mt-1.0-master"
This reverts commit f5302c64d9074f8250bb7e372a5faa3ba515767d, reversing
changes made to a04667db95c879584ec3a83d902ea61c1584ec27.

svn path=/tags/monotouch-1-0/mono/; revision=143559
2009-10-06 20:25:22 +00:00
Zoltan Varga d6e27776a9 Merge branch 'master-2.6' into mt-1.0-master
svn path=/tags/monotouch-1-0/mono/; revision=143557
2009-10-06 20:20:06 +00:00
6 changed files with 39 additions and 7 deletions

No files matched your search

+23
View File
@@ -4,6 +4,29 @@
the runtime coreclr tests (without an infinite recursion when
throwing an exception).
2009-09-10 Rodrigo Kumpera <[email protected]>
object.c (mono_delegate_ctor_with_method): Guard against null method.
2009-09-10 Rodrigo Kumpera <[email protected]>
* marshal.c (mono_marshal_get_xappdomain_dispatch): Add an assert
that should be replaced with error handling later.
2009-09-10 Rodrigo Kumpera <[email protected]>
* marshal.c (mono_delegate_end_invoke): Fix warning.
2009-09-10 Rodrigo Kumpera <[email protected]>
* loader.c (mono_field_from_token): Properly handle invalid
dynamic tokens.
2009-09-10 Rodrigo Kumpera <[email protected]>
* pedump.c (verify_image_file): Skip types that can't be
decoded.
2009-09-10 Rodrigo Kumpera <[email protected]>
* verify.c: Look for recursive valuetypes only against the
+1 -1
View File
@@ -517,7 +517,7 @@ mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass,
*retklass = NULL;
result = mono_lookup_dynamic_token_class (image, token, TRUE, &handle_class, context);
// This checks the memberref type as well
if (result && handle_class != mono_defaults.fieldhandle_class) {
if (!result || handle_class != mono_defaults.fieldhandle_class) {
mono_loader_set_error_bad_image (g_strdup ("Bad field token."));
return NULL;
}
+5 -1
View File
@@ -2473,8 +2473,10 @@ mono_delegate_end_invoke (MonoDelegate *delegate, gpointer *params)
msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
ares = mono_array_get (msg->args, gpointer, sig->param_count - 1);
if (ares == NULL)
if (ares == NULL) {
mono_raise_exception (mono_exception_from_name_msg (mono_defaults.corlib, "System.Runtime.Remoting", "RemotingException", "The async result object is null or of an unexpected type."));
return NULL;
}
if (ares->async_delegate != (MonoObject*)delegate && mono_framework_version () >= 2) {
mono_raise_exception (mono_get_exception_invalid_operation (
@@ -3135,6 +3137,8 @@ mono_marshal_get_xappdomain_dispatch (MonoMethod *method, int *marshal_types, in
mono_mb_emit_ldloc (mb, loc_array);
mono_mb_emit_icon (mb, complex_count); /* The array has an additional slot to hold the ret value */
mono_mb_emit_ldloc (mb, loc_return);
g_assert (ret_class); /*FIXME properly fail here*/
if (ret_class->valuetype) {
mono_mb_emit_op (mb, CEE_BOX, ret_class);
}
+1 -1
View File
@@ -5356,7 +5356,7 @@ mono_delegate_ctor_with_method (MonoObject *this, MonoObject *target, gpointer a
method = mono_marshal_get_remoting_invoke (method);
delegate->method_ptr = mono_compile_method (method);
MONO_OBJECT_SETREF (delegate, target, target);
} else if (mono_method_signature (method)->hasthis && method->klass->valuetype) {
} else if (method && mono_method_signature (method)->hasthis && method->klass->valuetype) {
method = mono_marshal_get_unbox_wrapper (method);
delegate->method_ptr = mono_compile_method (method);
MONO_OBJECT_SETREF (delegate, target, target);
+5
View File
@@ -1,3 +1,8 @@
2009-09-10 Zoltan Varga <[email protected]>
* aot-compiler.c (arch_emit_static_rgctx_trampoline): Don't clobber argument
reg r1 on arm.
2009-09-10 Bill Holmes <[email protected]>
* mini-trampolines.c (mono_delegate_trampoline) : Call
+4 -4
View File
@@ -879,11 +879,11 @@ arch_emit_static_rgctx_trampoline (MonoAotCompile *acfg, int offset, int *tramp_
*tramp_size = 24;
code = buf;
/* Load rgctx value */
ARM_LDR_IMM (code, ARMREG_R1, ARMREG_PC, 8);
ARM_LDR_REG_REG (code, MONO_ARCH_RGCTX_REG, ARMREG_PC, ARMREG_R1);
ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 8);
ARM_LDR_REG_REG (code, MONO_ARCH_RGCTX_REG, ARMREG_PC, ARMREG_IP);
/* Load branch addr + branch */
ARM_LDR_IMM (code, ARMREG_R1, ARMREG_PC, 4);
ARM_LDR_REG_REG (code, ARMREG_PC, ARMREG_PC, ARMREG_R1);
ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 4);
ARM_LDR_REG_REG (code, ARMREG_PC, ARMREG_PC, ARMREG_IP);
g_assert (code - buf == 16);