From: Zoltan Varga <vargaz@gmail.com>
Date: Sat, 4 Jan 2014 00:15:06 +0000 (+0100)
Subject: [jit] Avoid nullifying class init trampolines for recursive calls to class initialize... 
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=fefb5f9b7b8a205ee33393e43847b68e626708ad;p=mono.git

[jit] Avoid nullifying class init trampolines for recursive calls to class initializers. Fixes #16489
---

diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index b95ccf557c2..3cdfbe9b66b 100644
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -894,10 +894,11 @@ mono_class_init_trampoline (mgreg_t *regs, guint8 *code, MonoVTable *vtable, gui
 
 	mono_runtime_class_init (vtable);
 
-	if (plt_entry) {
-		mono_arch_nullify_plt_entry (plt_entry, regs);
-	} else {
-		mono_arch_nullify_class_init_trampoline (code, regs);
+	if (vtable->initialized) {
+		if (plt_entry)
+			mono_arch_nullify_plt_entry (plt_entry, regs);
+		else
+			mono_arch_nullify_class_init_trampoline (code, regs);
 	}
 }