* Exception.cs: Cosmetic change to default exception message on

[mono.git] / mono / mini / ssapre.c

diff --git a/mono/mini/ssapre.c b/mono/mini/ssapre.c
index 8f5f61ea2f2cdc2b5fd0a483ea8c67ee79907653..9c2ef0bd322c0ae237955f8e970d363e347652cd 100644 (file)
--- a/mono/mini/ssapre.c
+++ b/mono/mini/ssapre.c
@@ -18,8 +18,6 @@
 
 #include "ssapre.h"
 
-extern guint8 mono_burg_arity [];
-
 /* Logging conditions */
 #define DUMP_LEVEL (4)
 #define TRACE_LEVEL (3)
@@ -341,12 +339,14 @@ analyze_argument (MonoInst *argument, MonoSsapreExpressionArgument *result) {
 static void
 analyze_expression (MonoInst *expression, MonoSsapreExpressionDescription *result) {
        switch (expression->opcode) {
+#define SSAPRE_SPECIFIC_OPS 1
 #define OPDEF(a1,a2,a3,a4,a5,a6,a7,a8,a9,a10) case a1:
-#include "ssapre-cee-ops.h"
+#include "simple-cee-ops.h"
 #undef OPDEF
 #define MINI_OP(a1,a2) case a1:
-#include "ssapre-mini-ops.h"
+#include "simple-mini-ops.h"
 #undef MINI_OP
+#undef SSAPRE_SPECIFIC_OPS
                if ( (expression->type == STACK_I4) ||
                                (expression->type == STACK_PTR) ||
                                (expression->type == STACK_MP) ||
@@ -804,7 +804,7 @@ static void
 process_bb (MonoSsapreWorkArea *area, MonoBasicBlock *bb, int *dt_dfn, int *upper_descendants, int current_depth) {
        MonoSsapreBBInfo *bb_info;
        int descendants;
-       GList *dominated_bb;
+       GSList *dominated_bb;
        MonoInst* current_inst;
        MonoInst* previous_inst;
        MonoSsapreFatherExpression** dummy_father_in_tree;
@@ -872,7 +872,7 @@ process_bb (MonoSsapreWorkArea *area, MonoBasicBlock *bb, int *dt_dfn, int *uppe
                area->dt_depth = current_depth;
        }
        descendants = 0;
-       for (dominated_bb = g_list_first (bb->dominated); dominated_bb != NULL; dominated_bb = g_list_next (dominated_bb)) {
+       for (dominated_bb = bb->dominated; dominated_bb != NULL; dominated_bb = dominated_bb->next) {
                process_bb (area, (MonoBasicBlock*) (dominated_bb->data), dt_dfn, &descendants, current_depth + 1);
        }
        bb_info->dt_descendants = descendants;