Create GC maps for methods with nono-finally clauses.

diff --git a/mono/mini/mini-gc.c b/mono/mini/mini-gc.c
index 89c9f4c7060d5d926f89b193a4a09570336b054d..24df74d9de37d9b3bc4efa8c4375481928f0ca53 100644 (file)
--- a/mono/mini/mini-gc.c
+++ b/mono/mini/mini-gc.c
@@ -2057,6 +2057,8 @@ create_map (MonoCompile *cfg)
 void
 mini_gc_create_gc_map (MonoCompile *cfg)
 {
+       int i;
+
        if (!cfg->compute_gc_maps)
                return;
 
@@ -2070,12 +2072,16 @@ mini_gc_create_gc_map (MonoCompile *cfg)
                /* Without liveness info, the live ranges are not precise enough */
                return;
 
-       if (cfg->header->num_clauses)
-               /*
-                * The calls to the finally clauses don't show up in the cfg. See
-                * test_0_liveness_8 ().
-                */
-               return;
+       for (i = 0; i < cfg->header->num_clauses; ++i) {
+               MonoExceptionClause *clause = &cfg->header->clauses [i];
+
+               if (clause->flags == MONO_EXCEPTION_CLAUSE_FINALLY)
+                       /*
+                        * The calls to the finally clauses don't show up in the cfg. See
+                        * test_0_liveness_8 ().
+                        */
+                       return;
+       }
 
        mono_analyze_liveness_gc (cfg);