Merge pull request #1617 from keneanung/OdbcCommandExceptionOnNoData

[mono.git] / mono / metadata / sgen-old-bridge.c

diff --git a/mono/metadata/sgen-old-bridge.c b/mono/metadata/sgen-old-bridge.c
index 4e2ba7b84d79053c215747c8d962fc7e5ee67d9d..c2f5db5bf942abb3eabb8d9e3d4eb8470fa32149 100644 (file)
--- a/mono/metadata/sgen-old-bridge.c
+++ b/mono/metadata/sgen-old-bridge.c
@@ -442,7 +442,7 @@ add_source (HashEntry *entry, HashEntry *src)
 static void
 free_data (void)
 {
-       MonoObject *obj;
+       MonoObject *obj G_GNUC_UNUSED;
        HashEntry *entry;
        int total_srcs = 0;
        int max_srcs = 0;
@@ -526,7 +526,7 @@ dfs1 (HashEntry *obj_entry)
 
                        obj = obj_entry->obj;
                        start = (char*)obj;
-                       desc = sgen_obj_get_descriptor (start);
+                       desc = sgen_obj_get_descriptor_safe (start);
 
                        if (src) {
                                //g_print ("link %s -> %s\n", sgen_safe_name (src->obj), sgen_safe_name (obj));
@@ -682,8 +682,7 @@ processing_build_callback_data (int generation)
        int i, j;
        int num_sccs, num_xrefs;
        int max_entries, max_xrefs;
-       int sccs_size;
-       MonoObject *obj;
+       MonoObject *obj G_GNUC_UNUSED;
        HashEntry *entry;
        HashEntry **all_entries;
        MonoGCBridgeSCC **api_sccs;
@@ -774,8 +773,6 @@ processing_build_callback_data (int generation)
                }
        }
 
-       sccs_size = dyn_array_scc_size (&sccs);
-
        for (i = 0; i < hash_table.num_entries; ++i) {
                HashEntry *entry = all_entries [i];
                second_pass_links += dyn_array_ptr_size (&entry->srcs);