#include "mono/metadata/exception.h"
#include "mono/metadata/debug-helpers.h"
#include "mono/metadata/reflection-internals.h"
+#include "mono/metadata/assembly.h"
typedef enum {
MONO_MARSHAL_NONE, /* No marshalling needed */
static MonoObject *
mono_remoting_wrapper (MonoMethod *method, gpointer *params);
+static MonoException *
+mono_remoting_update_exception (MonoException *exc);
+
static gint32
mono_marshal_set_domain_by_id (gint32 id, MonoBoolean push);
register_icall (ves_icall_mono_marshal_xdomain_copy_value, "ves_icall_mono_marshal_xdomain_copy_value", "object object", FALSE);
register_icall (mono_marshal_xdomain_copy_out_value, "mono_marshal_xdomain_copy_out_value", "void object object", FALSE);
register_icall (mono_remoting_wrapper, "mono_remoting_wrapper", "object ptr ptr", FALSE);
+ register_icall (mono_remoting_update_exception, "mono_remoting_update_exception", "object object", FALSE);
register_icall (mono_upgrade_remote_class_wrapper, "mono_upgrade_remote_class_wrapper", "void object object", FALSE);
#ifndef DISABLE_JIT
if (exc) {
error_init (&error);
+ exc = (MonoObject*) mono_remoting_update_exception ((MonoException*)exc);
mono_error_set_exception_instance (&error, (MonoException *)exc);
goto fail;
}
return NULL;
}
+/*
+ * Handles exception transformation at appdomain call boundary.
+ * Note this is called from target appdomain inside xdomain wrapper, but from
+ * source domain in the mono_remoting_wrapper slowpath.
+ */
+static MonoException *
+mono_remoting_update_exception (MonoException *exc)
+{
+ MonoInternalThread *thread;
+ MonoClass *klass = mono_object_get_class ((MonoObject*)exc);
+
+ /* Serialization error can only happen when still in the target appdomain */
+ if (!(mono_class_get_flags (klass) & TYPE_ATTRIBUTE_SERIALIZABLE)) {
+ MonoException *ret;
+ char *aname = mono_stringify_assembly_name (&klass->image->assembly->aname);
+ char *message = g_strdup_printf ("Type '%s' in Assembly '%s' is not marked as serializable", klass->name, aname);
+ ret = mono_get_exception_serialization (message);
+ g_free (aname);
+ g_free (message);
+ return ret;
+ }
+
+ thread = mono_thread_internal_current ();
+ if (mono_object_get_class ((MonoObject*)exc) == mono_defaults.threadabortexception_class &&
+ thread->flags & MONO_THREAD_FLAG_APPDOMAIN_ABORT) {
+ mono_thread_internal_reset_abort (thread);
+ return mono_get_exception_appdomain_unloaded ();
+ }
+
+ return exc;
+}
/**
* mono_marshal_get_remoting_invoke:
/* handler code */
main_clause->handler_offset = mono_mb_get_label (mb);
+
+ mono_mb_emit_icall (mb, mono_remoting_update_exception);
+ mono_mb_emit_op (mb, CEE_CASTCLASS, mono_defaults.exception_class);
mono_mb_emit_managed_call (mb, method_rs_serialize_exc, NULL);
mono_mb_emit_stloc (mb, loc_serialized_exc);
mono_mb_emit_ldarg (mb, 2);
mono_mb_emit_ldloc (mb, loc_serialized_exc);
mono_mb_emit_byte (mb, CEE_STIND_REF);
mono_mb_emit_branch (mb, CEE_LEAVE);
+
main_clause->handler_len = mono_mb_get_pos (mb) - main_clause->handler_offset;
/* end catch */
-
mono_mb_patch_branch (mb, pos_leave);
if (copy_return)