2003-08-30 Zoltan Varga <vargaz@freemail.hu>

	* interp.c: Use mono_field_from_token () in the appropriate places.
	This simplifies the code and also fixes #48051.

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

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index ad993004429186a8e6ac8f93fc2975f5630a8bdb..009a3e29ce162e989760917d75114459f472f912 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-30  Zoltan Varga  <vargaz@freemail.hu>
+
+       * interp.c: Use mono_field_from_token () in the appropriate places.
+       This simplifies the code and also fixes #48051.
+
 2003-08-27  Zoltan Varga  <vargaz@freemail.hu>
 
        * interp.c (main): Fix the order of initialization calls so it maches 

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 8ab0430ffa0dba1110da41b0f6e5994a2c86e751..39bb85ff9a76031ee54c7cd4e54b333dcb67eeaa 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -921,13 +921,7 @@ calc_offsets (MonoImage *image, MonoMethod *method)
                        break;
                case MonoInlineField:
                        token = read32 (ip + 1);
-                       if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
-                               mono_field_from_memberref (image, token, &class);
-                       } else {
-                               class = mono_class_get (image, 
-                                       MONO_TOKEN_TYPE_DEF | mono_metadata_typedef_from_field (image, token & 0xffffff));
-                       }
-                       mono_class_init (class);
+                       mono_field_from_token (image, token, &class);
                        mono_class_vtable (domain, class);
                        ip += 5;
                        break;
@@ -2845,15 +2839,12 @@ array_constructed:
                                        field = mono_class_get_field (klass, token);
                                        addr = mono_load_remote_field (obj, klass, field, NULL);
                                } else {
-                                       if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF)
-                                               field = mono_field_from_memberref (image, token, NULL);
-                                       else
-                                               field = mono_class_get_field (obj->vtable->klass, token);
+                                       field = mono_field_from_token (image, token, NULL);
                                        addr = (char*)obj + field->offset;
                                }                               
                        } else {
                                obj = sp [-1].data.vt.vt;
-                               field = mono_class_get_field (sp [-1].data.vt.klass, token);
+                               field = mono_field_from_token (image, token, NULL);
                                addr = (char*)obj + field->offset - sizeof (MonoObject);
                        }
 
@@ -2892,17 +2883,14 @@ array_constructed:
                                        mono_store_remote_field (obj, klass, field, &sp [1].data);
                                        offset = field->offset;
                                } else {
-                                       if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF)
-                                               field = mono_field_from_memberref (image, token, NULL);
-                                       else
-                                               field = mono_class_get_field (obj->vtable->klass, token);
+                                       field = mono_field_from_token (image, token, NULL);
                                        offset = field->offset;
                                        stackval_to_data (field->type, &sp [1], (char*)obj + offset, FALSE);
                                        vt_free (&sp [1]);
                                }
                        } else {
                                obj = sp [0].data.vt.vt;
-                               field = mono_class_get_field (sp [0].data.vt.klass, token);
+                               field = mono_field_from_token (image, token, NULL);
                                offset = field->offset - sizeof (MonoObject);
                                stackval_to_data (field->type, &sp [1], (char*)obj + offset, FALSE);
                                vt_free (&sp [1]);
@@ -2923,14 +2911,7 @@ array_constructed:
                        token = read32 (ip);
                        ip += 4;
                        
-                       /* need to handle fieldrefs */
-                       if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
-                               field = mono_field_from_memberref (image, token, &klass);
-                       } else {
-                               klass = mono_class_get (image, 
-                                       MONO_TOKEN_TYPE_DEF | mono_metadata_typedef_from_field (image, token & 0xffffff));
-                               field = mono_class_get_field (klass, token);
-                       }
+                       field = mono_field_from_token (image, token, &klass);
                        g_assert (field);
                        
                        vt = mono_class_vtable (domain, klass);
@@ -2964,14 +2945,7 @@ array_constructed:
                        ip += 4;
                        --sp;
 
-                       /* need to handle fieldrefs */
-                       if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
-                               field = mono_field_from_memberref (image, token, &klass);
-                       } else {
-                               klass = mono_class_get (image, 
-                                       MONO_TOKEN_TYPE_DEF | mono_metadata_typedef_from_field (image, token & 0xffffff));
-                               field = mono_class_get_field (klass, token);
-                       }
+                       field = mono_field_from_token (image, token, &klass);
                        g_assert (field);
 
                        vt = mono_class_vtable (domain, klass);