From 9ff3f74910a0f89b00d958ac774b644c30763f62 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Wed, 16 Mar 2016 10:28:04 -0700 Subject: [PATCH] [runtime] Propagate error from class loading when JIT-ing This is another approach to a341404ecdd3b5ca2ed0ab1e9a5bcb9b5ccd2566 which was backed out because it was stale (2a899492c30740f6785883fae14bb1ddacbc8b77). --- mono/mini/mini-runtime.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c index 6a9f054864b..cce368bdcff 100644 --- a/mono/mini/mini-runtime.c +++ b/mono/mini/mini-runtime.c @@ -2007,7 +2007,9 @@ mono_jit_compile_method_with_opt (MonoMethod *method, guint32 opt, MonoError *er MonoVTable *vtable; mono_jit_stats.methods_lookups++; - vtable = mono_class_vtable (domain, method->klass); + vtable = mono_class_vtable_full (domain, method->klass, error); + if (!is_ok (error)) + return NULL; g_assert (vtable); if (!mono_runtime_class_init_full (vtable, error)) return NULL; -- 2.11.4.GIT