From 48bf0a385178acdf2760af42e817f11b08f0b008 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sun, 6 Jun 2010 20:35:20 +0000 Subject: [PATCH] 2010-06-06 Zoltan Varga * 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 --- mono/mini/ChangeLog | 3 +++ mono/mini/mini.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index a8e329d4eda..d6a832a90a2 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,8 @@ 2010-06-06 Zoltan Varga + * 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 62ca5434215..8509ae61f03 100644 --- 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); -- 2.25.1