[pedump] Print failure cause message when a class cannot be initialized

[mono.git] / tools / pedump / pedump.c

diff --git a/tools/pedump/pedump.c b/tools/pedump/pedump.c
index 829cda2bdf175fb13137240aa94b0d079346b931..322185faaf7dfd8049a94c213c41a76be9beb4b7 100644 (file)
--- a/tools/pedump/pedump.c
+++ b/tools/pedump/pedump.c
@@ -488,13 +488,21 @@ verify_image_file (const char *fname)
                }
                mono_class_init (klass);
                if (mono_class_has_failure (klass)) {
-                       printf ("Error verifying class(0x%08x) %s.%s a type load error happened\n", token, klass->name_space, klass->name);
+                       MonoError type_load_error;
+                       error_init (&type_load_error);
+                       mono_error_set_for_class_failure (&type_load_error, klass);
+                       printf ("Could not initialize class(0x%08x) %s.%s due to %s\n", token, klass->name_space, klass->name, mono_error_get_message (&type_load_error));
+                       mono_error_cleanup (&type_load_error);
                        ++count;
                }
 
                mono_class_setup_vtable (klass);
                if (mono_class_has_failure (klass)) {
-                       printf ("Error verifying class(0x%08x) %s.%s a type load error happened\n", token, klass->name_space, klass->name);
+                       MonoError type_load_error;
+                       error_init (&type_load_error);
+                       mono_error_set_for_class_failure (&type_load_error, klass);
+                       printf ("Could not initialize vtable of class(0x%08x) %s.%s due to %s\n", token, klass->name_space, klass->name, mono_error_get_message (&type_load_error));
+                       mono_error_cleanup (&type_load_error);
                        ++count;
                }
        }
@@ -671,7 +679,7 @@ main (int argc, char *argv [])
 #ifndef HOST_WIN32
        mono_w32handle_init ();
 #endif
-       mono_threads_runtime_init (&ticallbacks);
+       mono_thread_info_runtime_init (&ticallbacks);
 
        mono_metadata_init ();
        mono_images_init ();