2005-02-05 Zoltan Varga <vargaz@freemail.hu>

	* mini.c (mono_jit_compile_method_inner): Add detection and a
	meaningfull error message for assemblies written in Managed C++.

svn path=/trunk/mono/; revision=40167

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index fa96d51b306aecab98282da179a6a6f92b066635..0f2b5e916bc48432742fdd26d59fde8cac0daf9b 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,11 @@
 2005-02-05  Zoltan Varga  <vargaz@freemail.hu>
 
+       * mini.c (mono_jit_compile_method_inner): Add detection and a 
+       meaningfull error message for assemblies written in Managed C++.
+
+       * tramp-amd64.c mini-amd64.h: Add support for 
+       create_trampoline_from_token ().
+
        * aot.c mini-x86.c abcremoval.c: Applied patch from
        Robert Jordan (robertj@gmx.net). Fix compilation errors under gcc-2.95.
 

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 3bcbf92bda86bd9d7e63e817022af50cf4beca98..3071633e5d2e1df145942594bc0181b0e1a5edc9 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -9043,6 +9043,9 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain)
                MonoMethod *nm;
                MonoMethodPInvoke* piinfo = (MonoMethodPInvoke *) method;
 
+               if (method->iflags & METHOD_IMPL_ATTRIBUTE_NATIVE)
+                       g_error ("Method '%s' in assembly '%s' contains native code and mono can't run it. The assembly was probably created by Managed C++.\n", mono_method_full_name (method, TRUE), method->klass->image->name);
+
                if (!piinfo->addr) {
                        if (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
                                piinfo->addr = mono_lookup_internal_call (method);