2003-01-14 Dietmar Maurer <dietmar@ximian.com>

	* jit.c (mono_jit_compile_method):  make sure runtime_init is called
	(mono_analyze_stack): make sure runtime_init is called

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

diff --git a/mono/jit/ChangeLog b/mono/jit/ChangeLog
index c5883f8b70c6767d8ad71c4a2a506cecb5f5a8ad..3f31beb09f9f80dd2602a6193516dd7b875480da 100644 (file)
--- a/mono/jit/ChangeLog
+++ b/mono/jit/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-14  Dietmar Maurer  <dietmar@ximian.com>
+
+       * jit.c (mono_jit_compile_method):  make sure runtime_init is called 
+       (mono_analyze_stack): make sure runtime_init is called
+
 2003-01-14  Martin Baulig  <martin@ximian.com>
 
        * debug.c (debugger_update_symbol_file_table): Moved all the

diff --git a/mono/jit/jit.c b/mono/jit/jit.c
index 977fa0f0d5a171d3cff1ede7573a29aca247fdbe..4fd06dc6ec84901f79e85a804f56fb423f42a85f 100644 (file)
--- a/mono/jit/jit.c
+++ b/mono/jit/jit.c
@@ -2110,6 +2110,9 @@ mono_analyze_stack (MonoFlowGraph *cfg)
                                
                                if (!l) {
 
+                                       /* make sure runtime_init is called */
+                                       mono_class_vtable (cfg->domain, cm->klass);
+
                                        mono_jit_stats.inlined_methods++;
                                
                                        if (cm->signature->hasthis)
@@ -2225,7 +2228,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
                                                       (cm->klass->marshalbyref || shared_to_unshared_call))) {
                                
                                        mono_class_init (cm->klass);
-                                       
+
                                        if (cm->klass->flags & TYPE_ATTRIBUTE_INTERFACE)
                                                t2 = mono_ctree_new_leaf (mp, MB_TERM_INTF_ADDR);
                                        else 
@@ -3945,6 +3948,9 @@ mono_jit_compile_method (MonoMethod *method)
 
        g_hash_table_insert (jit_code_hash, method, addr);
 
+       /* make sure runtime_init is called */
+       mono_class_vtable (target_domain, method->klass);
+
        return addr;
 }
 

diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index c6127816686842b96b0e5ecc722546346291985e..a75507774815ab6c73b6522d2362ef81510ee298 100644 (file)
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -54,7 +54,7 @@ mono_runtime_object_init (MonoObject *this)
 }
 
 /*
- * runtime_class_init:
+ * mono_runtime_class_init:
  * @klass: klass that needs to be initialized
  *
  * This routine calls the class constructor for @class.