2010-06-06 Zoltan Varga <vargaz@gmail.com>

	* mini.c (mono_jit_runtime_invoke): Initialize *exc to NULL before calling the wrapper,
	so it doesn't have to do it.

svn path=/trunk/mono/; revision=158569

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index a8e329d4edab5850809a2a72426b7163be839051..d6a832a90a21f5fab6db6ff1cbdc42ee0dda7c53 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-06  Zoltan Varga  <vargaz@gmail.com>
 
+       * mini.c (mono_jit_runtime_invoke): Initialize *exc to NULL before calling the wrapper,
+       so it doesn't have to do it.
+
        * helpers.c (mono_disassemble_code): Flush stdout, so the output from the spawned
        process does not mix with ours.
 

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 62ca54342159d585e8067fad4c589d228fbe8714..8509ae61f03a74eeb6b1d8e77dc8055d75d06c72 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -5251,6 +5251,10 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                mono_runtime_class_init (info->vtable);
        }
 
+       /* The wrappers expect this to be initialized to NULL */
+       if (exc)
+               *exc = NULL;
+
 #ifdef MONO_ARCH_DYN_CALL_SUPPORTED
        if (info->dyn_call_info) {
                MonoMethodSignature *sig = mono_method_signature (method);