From 2c208fbd8903c67f8ab4a48de8636d5d5b1cd0d6 Mon Sep 17 00:00:00 2001 From: Ben Maurer Date: Sat, 13 Nov 2004 00:38:16 +0000 Subject: [PATCH] 2004-11-12 Ben Maurer * transform.c: Fix bug with delegates in interp. svn path=/trunk/mono/; revision=36082 --- mono/interpreter/ChangeLog | 4 ++++ mono/interpreter/transform.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog index ec84c8a8552..8a70c06c377 100644 --- a/mono/interpreter/ChangeLog +++ b/mono/interpreter/ChangeLog @@ -1,3 +1,7 @@ +2004-11-12 Ben Maurer + + * transform.c: Fix bug with delegates in interp. + 2004-11-10 Lluis Sanchez Gual * interp.c: Added MonoRemotingTarget parameter to signature diff --git a/mono/interpreter/transform.c b/mono/interpreter/transform.c index 34f8a89ac59..81f1fbd126c 100644 --- a/mono/interpreter/transform.c +++ b/mono/interpreter/transform.c @@ -1012,8 +1012,8 @@ generate(MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start) td.ip += 5; break; } else { - - if (*mheader->code == CEE_RET && called_inited) { + /* mheader might not exist if this is a delegate invoc, etc */ + if (mheader && *mheader->code == CEE_RET && called_inited) { if (mono_interp_traceopt) g_print ("Inline (empty) call of %s.%s\n", m->klass->name, m->name); for (i = 0; i < csignature->param_count; i++) -- 2.11.4.GIT