[jit] Use mono_set_pending_exception () in one jit icall.
authorZoltan Varga <vargaz@gmail.com>
Wed, 27 Jan 2016 00:40:39 +0000 (19:40 -0500)
committerZoltan Varga <vargaz@gmail.com>
Wed, 27 Jan 2016 00:40:39 +0000 (19:40 -0500)
mono/mini/jit-icalls.c

index 797a1f19d7f6a9be71fe937bb93c3cb87eac71fd..0f5914c1f027244dd75b637709708d29f60c9566 100644 (file)
@@ -1714,8 +1714,10 @@ mono_llvmonly_get_calling_assembly (void)
 
        jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        g_assert (jit_tls);
-       if (!jit_tls->calling_image)
-               mono_raise_exception (mono_get_exception_not_supported ("Stack walks are not supported on this platform."));
+       if (!jit_tls->calling_image) {
+               mono_set_pending_exception (mono_get_exception_not_supported ("Stack walks are not supported on this platform."));
+               return NULL;
+       }
        return (MonoObject*)mono_assembly_get_object (mono_domain_get (), jit_tls->calling_image->assembly);
 }