[sgen] Fix warnings.

[mono.git] / mono / metadata / image.c

diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index d5c05bef527831e5190aa8f95b0a5c931dbc8671..493b91810418044b06ab202c3876015d0749ebbe 100644 (file)
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -65,7 +65,7 @@ struct ImageUnloadHook {
        gpointer user_data;
 };
 
-GSList *image_unload_hooks;
+static GSList *image_unload_hooks;
 
 void
 mono_install_image_unload_hook (MonoImageUnloadFunc func, gpointer user_data)
@@ -232,7 +232,6 @@ mono_image_ensure_section_idx (MonoImage *image, int section)
 {
        MonoCLIImageInfo *iinfo = image->image_info;
        MonoSectionTable *sect;
-       gboolean writable;
        
        g_return_val_if_fail (section < iinfo->cli_section_count, FALSE);
 
@@ -241,8 +240,6 @@ mono_image_ensure_section_idx (MonoImage *image, int section)
 
        sect = &iinfo->cli_section_tables [section];
        
-       writable = sect->st_flags & SECT_FLAGS_MEM_WRITE;
-
        if (sect->st_raw_data_ptr + sect->st_raw_data_size > image->raw_data_len)
                return FALSE;
 #ifdef HOST_WIN32
@@ -478,7 +475,7 @@ load_tables (MonoImage *image)
 {
        const char *heap_tables = image->heap_tables.data;
        const guint32 *rows;
-       guint64 valid_mask, sorted_mask;
+       guint64 valid_mask;
        int valid = 0, table;
        int heap_sizes;
        
@@ -488,7 +485,6 @@ load_tables (MonoImage *image)
        image->idx_blob_wide   = ((heap_sizes & 0x04) == 4);
        
        valid_mask = read64 (heap_tables + 8);
-       sorted_mask = read64 (heap_tables + 16);
        rows = (const guint32 *) (heap_tables + 24);
        
        for (table = 0; table < 64; table++){
@@ -503,9 +499,6 @@ load_tables (MonoImage *image)
                } else {
                        image->tables [table].rows = read32 (rows);
                }
-               /*if ((sorted_mask & ((guint64) 1 << table)) == 0){
-                       g_print ("table %s (0x%02x) is sorted\n", mono_meta_table_name (table), table);
-               }*/
                rows++;
                valid++;
        }
@@ -907,10 +900,8 @@ gboolean
 mono_image_load_cli_data (MonoImage *image)
 {
        MonoCLIImageInfo *iinfo;
-       MonoDotNetHeader *header;
 
        iinfo = image->image_info;
-       header = &iinfo->cli_header;
 
        /* Load the CLI header */
        if (!load_cli_header (image, iinfo))
@@ -1618,6 +1609,10 @@ mono_image_close_except_pools (MonoImage *image)
        }
 
        free_hash (image->native_wrapper_cache);
+       free_hash (image->native_wrapper_aot_cache);
+       free_hash (image->native_wrapper_check_cache);
+       free_hash (image->native_wrapper_aot_check_cache);
+       free_hash (image->native_func_wrapper_cache);
        free_hash (image->managed_wrapper_cache);
        free_hash (image->delegate_begin_invoke_cache);
        free_hash (image->delegate_end_invoke_cache);
@@ -1647,11 +1642,14 @@ mono_image_close_except_pools (MonoImage *image)
        free_hash (image->thunk_invoke_cache);
        free_hash (image->var_cache_slow);
        free_hash (image->mvar_cache_slow);
+       free_hash (image->var_cache_constrained);
+       free_hash (image->mvar_cache_constrained);
        free_hash (image->wrapper_param_names);
-       free_hash (image->native_wrapper_aot_cache);
        free_hash (image->pinvoke_scopes);
        free_hash (image->pinvoke_scope_filenames);
-       free_hash (image->gsharedvt_types);
+       for (i = 0; i < image->gshared_types_len; ++i)
+               free_hash (image->gshared_types [i]);
+       g_free (image->gshared_types);
 
        /* The ownership of signatures is not well defined */
        g_hash_table_destroy (image->memberref_signatures);
@@ -1998,21 +1996,27 @@ mono_image_load_file_for_image (MonoImage *image, int fileidx)
        if (fileidx < 1 || fileidx > t->rows)
                return NULL;
 
-       mono_loader_lock ();
+       mono_image_lock (image);
        if (image->files && image->files [fileidx - 1]) {
-               mono_loader_unlock ();
+               mono_image_unlock (image);
                return image->files [fileidx - 1];
        }
 
-       if (!image->files)
-               image->files = g_new0 (MonoImage*, t->rows);
-
        fname_id = mono_metadata_decode_row_col (t, fileidx - 1, MONO_FILE_NAME);
        fname = mono_metadata_string_heap (image, fname_id);
        base_dir = g_path_get_dirname (image->name);
        name = g_build_filename (base_dir, fname, NULL);
        res = mono_image_open (name, NULL);
-       if (res) {
+       if (!res)
+               goto done;
+
+       mono_image_lock (image);
+       if (image->files && image->files [fileidx - 1]) {
+               MonoImage *old = res;
+               res = image->files [fileidx - 1];
+               mono_loader_unlock ();
+               mono_image_close (old);
+       } else {
                int i;
                /* g_print ("loaded file %s from %s (%p)\n", name, image->name, image->assembly); */
                res->assembly = image->assembly;
@@ -2021,13 +2025,18 @@ mono_image_load_file_for_image (MonoImage *image, int fileidx)
                                res->modules [i]->assembly = image->assembly;
                }
 
+               if (!image->files)
+                       image->files = g_new0 (MonoImage*, t->rows);
                image->files [fileidx - 1] = res;
+               mono_loader_unlock ();
+               /* vtable fixup can't happen with the image lock held */
 #ifdef HOST_WIN32
                if (res->is_module_handle)
                        mono_image_fixup_vtable (res);
 #endif
        }
-       mono_loader_unlock ();
+
+done:
        g_free (name);
        g_free (base_dir);
        return res;