Remove special cases for EXPR_ERROR and TYPE_ERROR from constant folding and type...
[cparser] / ast2firm.c
index 71172df..cdf3174 100644 (file)
@@ -521,7 +521,7 @@ static ir_type *create_bitfield_type(const entity_t *entity)
        }
 }
 
-#define INVALID_TYPE ((ir_type_ptr)-1)
+#define INVALID_TYPE ((ir_type*)-1)
 
 enum {
        COMPOUND_IS_STRUCT = false,
@@ -618,15 +618,14 @@ static ir_type *create_compound_type(compound_type_t *type,
        return irtype;
 }
 
+static ir_tarval *fold_constant_to_tarval(expression_t const *);
+
 static void determine_enum_values(enum_type_t *const type)
 {
        ir_mode   *const mode    = atomic_modes[type->base.akind];
        ir_tarval *const one     = get_mode_one(mode);
        ir_tarval *      tv_next = get_mode_null(mode);
 
-       bool constant_folding_old = constant_folding;
-       constant_folding = true;
-
        enum_t   *enume = type->enume;
        entity_t *entry = enume->base.next;
        for (; entry != NULL; entry = entry->base.next) {
@@ -635,18 +634,12 @@ static void determine_enum_values(enum_type_t *const type)
 
                expression_t *const init = entry->enum_value.value;
                if (init != NULL) {
-                       ir_node *const cnst = expression_to_firm(init);
-                       if (!is_Const(cnst)) {
-                               panic("couldn't fold constant");
-                       }
-                       tv_next = get_Const_tarval(cnst);
+                       tv_next = fold_constant_to_tarval(init);
                }
                assert(entry->enum_value.tv == NULL || entry->enum_value.tv == tv_next);
                entry->enum_value.tv = tv_next;
                tv_next = tarval_add(tv_next, one);
        }
-
-       constant_folding = constant_folding_old;
 }
 
 static ir_type *create_enum_type(enum_type_t *const type)
@@ -687,10 +680,6 @@ ir_type *get_ir_type(type_t *type)
 
        ir_type *firm_type = NULL;
        switch (type->kind) {
-       case TYPE_ERROR:
-               /* Happens while constant folding, when there was an error */
-               return create_atomic_type(ATOMIC_TYPE_VOID, NULL);
-
        case TYPE_ATOMIC:
                firm_type = create_atomic_type(type->atomic.akind, type);
                break;
@@ -722,6 +711,7 @@ ir_type *get_ir_type(type_t *type)
                firm_type = create_enum_type(&type->enumt);
                break;
 
+       case TYPE_ERROR:
        case TYPE_TYPEOF:
        case TYPE_TYPEDEF:
                break;
@@ -1072,15 +1062,16 @@ static ir_node *create_symconst(dbg_info *dbgi, ir_entity *entity)
        return new_d_SymConst(dbgi, mode_P, sym, symconst_addr_ent);
 }
 
+static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v)
+{
+       return new_Const((v ? get_mode_one : get_mode_null)(mode));
+}
+
 static ir_node *create_conv_from_b(dbg_info *dbgi, ir_node *value,
                                    ir_mode *dest_mode)
 {
        if (is_Const(value)) {
-               if (is_Const_null(value)) {
-                       return new_Const(get_mode_null(dest_mode));
-               } else {
-                       return new_Const(get_mode_one(dest_mode));
-               }
+               return create_Const_from_bool(dest_mode, !is_Const_null(value));
        }
 
        ir_node *cond       = new_d_Cond(dbgi, value);
@@ -1112,7 +1103,7 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
 
        if (dest_mode == mode_b) {
                ir_node *zero = new_Const(get_mode_null(value_mode));
-               ir_node *cmp  = new_d_Cmp(dbgi, value, zero, ir_relation_less_greater);
+               ir_node *cmp  = new_d_Cmp(dbgi, value, zero, ir_relation_unordered_less_greater);
                return cmp;
        } else if (value_mode == mode_b) {
                return create_conv_from_b(dbgi, value, dest_mode);
@@ -1121,11 +1112,6 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
        return new_d_Conv(dbgi, value, dest_mode);
 }
 
-static ir_node *create_Const_from_bool(ir_mode *const mode, bool const v)
-{
-       return new_Const((v ? get_mode_one : get_mode_null)(mode));
-}
-
 /**
  * Creates a SymConst node representing a wide string literal.
  *
@@ -1726,7 +1712,7 @@ static ir_node *process_builtin_call(const call_expression_t *call)
                ir_node      *size     = expression_to_firm(argument);
 
                ir_node *store  = get_store();
-               ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type,
+               ir_node *alloca = new_d_Alloc(dbgi, store, size, get_unknown_type(),
                                              stack_alloc);
                ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M);
                set_store(proj_m);
@@ -2439,12 +2425,12 @@ static ir_node *unary_expression_to_firm(const unary_expression_t *expression)
        dbg_info *dbgi = get_dbg_info(&expression->base.source_position);
        type_t   *type = skip_typeref(expression->base.type);
 
-       if (expression->base.kind == EXPR_UNARY_TAKE_ADDRESS)
-               return expression_to_addr(expression->value);
-
        const expression_t *value = expression->value;
 
        switch(expression->base.kind) {
+       case EXPR_UNARY_TAKE_ADDRESS:
+               return expression_to_addr(value);
+
        case EXPR_UNARY_NEGATE: {
                ir_node *value_node = expression_to_firm(value);
                ir_mode *mode       = get_ir_mode_arithmetic(type);
@@ -2866,29 +2852,67 @@ static ir_node *offsetof_to_firm(const offsetof_expression_t *expression)
 
 static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
                                      ir_entity *entity, type_t *type);
+static ir_initializer_t *create_ir_initializer(
+               const initializer_t *initializer, type_t *type);
 
-static ir_node *compound_literal_to_firm(
-               const compound_literal_expression_t *expression)
+static ir_entity *create_initializer_entity(dbg_info *dbgi,
+                                            initializer_t *initializer,
+                                            type_t *type)
 {
-       type_t *type = expression->type;
+       /* create the ir_initializer */
+       ir_graph *const old_current_ir_graph = current_ir_graph;
+       current_ir_graph = get_const_code_irg();
 
-       /* create an entity on the stack */
-       ir_type *frame_type = get_irg_frame_type(current_ir_graph);
+       ir_initializer_t *irinitializer = create_ir_initializer(initializer, type);
+
+       assert(current_ir_graph == get_const_code_irg());
+       current_ir_graph = old_current_ir_graph;
 
-       ident     *const id     = id_unique("CompLit.%u");
-       ir_type   *const irtype = get_ir_type(type);
-       dbg_info  *const dbgi   = get_dbg_info(&expression->base.source_position);
-       ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi);
+       ident     *const id          = id_unique("initializer.%u");
+       ir_type   *const irtype      = get_ir_type(type);
+       ir_type   *const global_type = get_glob_type();
+       ir_entity *const entity      = new_d_entity(global_type, id, irtype, dbgi);
        set_entity_ld_ident(entity, id);
+       set_entity_visibility(entity, ir_visibility_private);
+       add_entity_linkage(entity, IR_LINKAGE_CONSTANT);
+       set_entity_initializer(entity, irinitializer);
+       return entity;
+}
 
-       /* create initialisation code */
+static ir_node *compound_literal_addr(compound_literal_expression_t const *const expression)
+{
+       dbg_info      *dbgi        = get_dbg_info(&expression->base.source_position);
+       type_t        *type        = expression->type;
        initializer_t *initializer = expression->initializer;
-       create_local_initializer(initializer, dbgi, entity, type);
 
-       /* create a sel for the compound literal address */
-       ir_node *frame = get_irg_frame(current_ir_graph);
-       ir_node *sel   = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
-       return sel;
+       if (is_constant_initializer(initializer) == EXPR_CLASS_CONSTANT) {
+               ir_entity *entity = create_initializer_entity(dbgi, initializer, type);
+               return create_symconst(dbgi, entity);
+       } else {
+               /* create an entity on the stack */
+               ident   *const id     = id_unique("CompLit.%u");
+               ir_type *const irtype = get_ir_type(type);
+               ir_type *frame_type   = get_irg_frame_type(current_ir_graph);
+
+               ir_entity *const entity = new_d_entity(frame_type, id, irtype, dbgi);
+               set_entity_ld_ident(entity, id);
+
+               /* create initialisation code */
+               create_local_initializer(initializer, dbgi, entity, type);
+
+               /* create a sel for the compound literal address */
+               ir_node *frame = get_irg_frame(current_ir_graph);
+               ir_node *sel   = new_d_simpleSel(dbgi, new_NoMem(), frame, entity);
+               return sel;
+       }
+}
+
+static ir_node *compound_literal_to_firm(compound_literal_expression_t const* const expr)
+{
+       dbg_info *const dbgi = get_dbg_info(&expr->base.source_position);
+       type_t   *const type = expr->type;
+       ir_node  *const addr = compound_literal_addr(expr);
+       return deref_address(dbgi, type, addr);
 }
 
 /**
@@ -2922,7 +2946,7 @@ static entity_t *get_expression_entity(const expression_t *expression)
 static unsigned get_cparser_entity_alignment(const entity_t *entity)
 {
        switch(entity->kind) {
-       DECLARATION_KIND_CASES
+       case DECLARATION_KIND_CASES:
                return entity->declaration.alignment;
        case ENTITY_STRUCT:
        case ENTITY_UNION:
@@ -2970,20 +2994,24 @@ static void init_ir_types(void);
 
 static ir_tarval *fold_constant_to_tarval(const expression_t *expression)
 {
-       assert(is_type_valid(skip_typeref(expression->base.type)));
+       assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT);
 
        bool constant_folding_old = constant_folding;
        constant_folding = true;
+       int old_optimize         = get_optimize();
+       int old_constant_folding = get_opt_constant_folding();
+       set_optimize(1);
+       set_opt_constant_folding(1);
 
        init_ir_types();
 
-       assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT);
-
        ir_graph *old_current_ir_graph = current_ir_graph;
        current_ir_graph = get_const_code_irg();
 
        ir_node *cnst = expression_to_firm(expression);
        current_ir_graph = old_current_ir_graph;
+       set_optimize(old_optimize);
+       set_opt_constant_folding(old_constant_folding);
 
        if (!is_Const(cnst)) {
                panic("couldn't fold constant");
@@ -2997,16 +3025,12 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression)
 /* this function is only used in parser.c, but it relies on libfirm functionality */
 bool constant_is_negative(const expression_t *expression)
 {
-       assert(is_constant_expression(expression) == EXPR_CLASS_CONSTANT);
        ir_tarval *tv = fold_constant_to_tarval(expression);
        return tarval_is_negative(tv);
 }
 
 long fold_constant_to_int(const expression_t *expression)
 {
-       if (expression->kind == EXPR_ERROR)
-               return 0;
-
        ir_tarval *tv = fold_constant_to_tarval(expression);
        if (!tarval_is_long(tv)) {
                panic("result of constant folding is not integer");
@@ -3017,8 +3041,6 @@ long fold_constant_to_int(const expression_t *expression)
 
 bool fold_constant_to_bool(const expression_t *expression)
 {
-       if (expression->kind == EXPR_ERROR)
-               return false;
        ir_tarval *tv = fold_constant_to_tarval(expression);
        return !tarval_is_null(tv);
 }
@@ -3339,7 +3361,7 @@ static ir_node *expression_to_addr(const expression_t *expression)
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
        case EXPR_COMPOUND_LITERAL:
-               return compound_literal_to_firm(&expression->compound_literal);
+               return compound_literal_addr(&expression->compound_literal);
        case EXPR_REFERENCE:
                return reference_addr(&expression->reference);
        case EXPR_SELECT:
@@ -3405,12 +3427,6 @@ static ir_node *label_address_to_firm(const label_address_expression_t *label)
        return new_d_SymConst(dbgi, mode_P_code, value, symconst_addr_ent);
 }
 
-static ir_node *error_to_firm(const expression_t *expression)
-{
-       ir_mode *mode = get_ir_mode_arithmetic(expression->base.type);
-       return new_Bad(mode);
-}
-
 /**
  * creates firm nodes for an expression. The difference between this function
  * and expression_to_firm is, that this version might produce mode_b nodes
@@ -3426,7 +3442,7 @@ static ir_node *_expression_to_firm(const expression_t *expression)
 #endif
 
        switch (expression->kind) {
-       EXPR_LITERAL_CASES
+       case EXPR_LITERAL_CASES:
                return literal_to_firm(&expression->literal);
        case EXPR_STRING_LITERAL:
                return string_to_firm(&expression->base.source_position, "str.%u",
@@ -3439,9 +3455,9 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return reference_expression_enum_value_to_firm(&expression->reference);
        case EXPR_CALL:
                return call_expression_to_firm(&expression->call);
-       EXPR_UNARY_CASES
+       case EXPR_UNARY_CASES:
                return unary_expression_to_firm(&expression->unary);
-       EXPR_BINARY_CASES
+       case EXPR_BINARY_CASES:
                return binary_expression_to_firm(&expression->binary);
        case EXPR_ARRAY_ACCESS:
                return array_access_to_firm(&expression->array_access);
@@ -3477,7 +3493,7 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return label_address_to_firm(&expression->label_address);
 
        case EXPR_ERROR:
-               return error_to_firm(expression);
+               break;
        }
        panic("invalid expression found");
 }
@@ -3915,9 +3931,6 @@ static void advance_current_object(type_path_t *path)
 }
 
 
-static ir_initializer_t *create_ir_initializer(
-               const initializer_t *initializer, type_t *type);
-
 static ir_initializer_t *create_ir_initializer_value(
                const initializer_value_t *initializer)
 {
@@ -4269,28 +4282,11 @@ static void create_local_initializer(initializer_t *initializer, dbg_info *dbgi,
                return;
        }
 
-       /* create the ir_initializer */
-       ir_graph *const old_current_ir_graph = current_ir_graph;
-       current_ir_graph = get_const_code_irg();
-
-       ir_initializer_t *irinitializer = create_ir_initializer(initializer, type);
-
-       assert(current_ir_graph == get_const_code_irg());
-       current_ir_graph = old_current_ir_graph;
-
        /* create a "template" entity which is copied to the entity on the stack */
-       ident     *const id          = id_unique("initializer.%u");
-       ir_type   *const irtype      = get_ir_type(type);
-       ir_type   *const global_type = get_glob_type();
-       ir_entity *const init_entity = new_d_entity(global_type, id, irtype, dbgi);
-       set_entity_ld_ident(init_entity, id);
-
-       set_entity_visibility(init_entity, ir_visibility_private);
-       add_entity_linkage(init_entity, IR_LINKAGE_CONSTANT);
-
-       set_entity_initializer(init_entity, irinitializer);
-
+       ir_entity *const init_entity
+               = create_initializer_entity(dbgi, initializer, type);
        ir_node *const src_addr = create_symconst(dbgi, init_entity);
+       ir_type *const irtype   = get_ir_type(type);
        ir_node *const copyb    = new_d_CopyB(dbgi, memory, addr, src_addr, irtype);
 
        ir_node *const copyb_mem = new_Proj(copyb, mode_M, pn_CopyB_M);
@@ -4328,16 +4324,29 @@ static void create_variable_initializer(entity_t *entity)
        if (initializer->kind == INITIALIZER_VALUE) {
                initializer_value_t *initializer_value = &initializer->value;
                dbg_info            *dbgi = get_dbg_info(&entity->base.source_position);
+               expression_t        *value     = initializer_value->value;
+               type_t              *init_type = value->base.type;
+               type_t              *skipped   = skip_typeref(init_type);
+
+               if (!is_type_scalar(skipped)) {
+                       /* skip convs */
+                       while (value->kind == EXPR_UNARY_CAST)
+                               value = value->unary.value;
+
+                       if (value->kind != EXPR_COMPOUND_LITERAL)
+                               panic("expected non-scalar initializer to be a compound literal");
+                       initializer = value->compound_literal.initializer;
+                       goto have_initializer;
+               }
 
-               ir_node *value = expression_to_firm(initializer_value->value);
+               ir_node *node = expression_to_firm(initializer_value->value);
 
-               type_t  *init_type = initializer_value->value->base.type;
                ir_mode *mode      = get_ir_mode_storage(init_type);
-               value = create_conv(dbgi, value, mode);
-               value = do_strict_conv(dbgi, value);
+               node = create_conv(dbgi, node, mode);
+               node = do_strict_conv(dbgi, node);
 
                if (declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE) {
-                       set_value(entity->variable.v.value_number, value);
+                       set_value(entity->variable.v.value_number, node);
                } else {
                        assert(declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
 
@@ -4347,9 +4356,10 @@ static void create_variable_initializer(entity_t *entity)
                                        && get_entity_owner(irentity) != get_tls_type()) {
                                add_entity_linkage(irentity, IR_LINKAGE_CONSTANT);
                        }
-                       set_atomic_ent_value(irentity, value);
+                       set_atomic_ent_value(irentity, node);
                }
        } else {
+have_initializer:
                assert(declaration_kind == DECLARATION_KIND_LOCAL_VARIABLE_ENTITY ||
                       declaration_kind == DECLARATION_KIND_GLOBAL_VARIABLE);
 
@@ -4708,41 +4718,33 @@ static void if_statement_to_firm(if_statement_t *statement)
                false_block = new_immBlock();
                create_condition_evaluation(statement->condition, true_block, false_block);
                mature_immBlock(true_block);
-       }
-
-       /* Create the false statement.
-        * Handle false before true, so if no false statement is present, then the
-        * empty false block is reused as fallthrough block. */
-       ir_node *fallthrough_block = NULL;
-       if (statement->false_statement != NULL) {
-               if (false_block != NULL) {
-                       mature_immBlock(false_block);
-               }
-               set_cur_block(false_block);
-               statement_to_firm(statement->false_statement);
-               if (currently_reachable()) {
-                       fallthrough_block = new_immBlock();
-                       add_immBlock_pred(fallthrough_block, new_Jmp());
-               }
-       } else {
-               fallthrough_block = false_block;
+               mature_immBlock(false_block);
        }
 
        /* Create the true statement. */
        set_cur_block(true_block);
        statement_to_firm(statement->true_statement);
-       if (currently_reachable()) {
-               if (fallthrough_block == NULL) {
-                       fallthrough_block = new_immBlock();
-               }
-               add_immBlock_pred(fallthrough_block, new_Jmp());
+       ir_node *fallthrough_block = get_cur_block();
+
+       /* Create the false statement. */
+       set_cur_block(false_block);
+       if (statement->false_statement != NULL) {
+               statement_to_firm(statement->false_statement);
        }
 
-       /* Handle the block after the if-statement. */
-       if (fallthrough_block != NULL) {
-               mature_immBlock(fallthrough_block);
+       /* Handle the block after the if-statement.  Minor simplification and
+        * optimisation: Reuse the false/true block as fallthrough block, if the
+        * true/false statement does not pass control to the fallthrough block, e.g.
+        * in the typical if (x) return; pattern. */
+       if (fallthrough_block) {
+               if (currently_reachable()) {
+                       ir_node *const t_jump = new_r_Jmp(fallthrough_block);
+                       ir_node *const f_jump = new_Jmp();
+                       ir_node *const in[]   = { t_jump, f_jump };
+                       fallthrough_block = new_Block(2, in);
+               }
+               set_cur_block(fallthrough_block);
        }
-       set_cur_block(fallthrough_block);
 }
 
 /* Create a jump node which jumps into target_block, if the current block is
@@ -5059,23 +5061,18 @@ static void label_to_firm(const label_statement_t *statement)
        statement_to_firm(statement->statement);
 }
 
-static void goto_to_firm(const goto_statement_t *statement)
+static void computed_goto_to_firm(computed_goto_statement_t const *const statement)
 {
        if (!currently_reachable())
                return;
 
-       if (statement->expression) {
-               ir_node  *irn  = expression_to_firm(statement->expression);
-               dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
-               ir_node  *ijmp = new_d_IJmp(dbgi, irn);
+       ir_node  *const irn  = expression_to_firm(statement->expression);
+       dbg_info *const dbgi = get_dbg_info(&statement->base.source_position);
+       ir_node  *const ijmp = new_d_IJmp(dbgi, irn);
+
+       set_irn_link(ijmp, ijmp_list);
+       ijmp_list = ijmp;
 
-               set_irn_link(ijmp, ijmp_list);
-               ijmp_list = ijmp;
-       } else {
-               ir_node *block = get_label_block(statement->label);
-               ir_node *jmp   = new_Jmp();
-               add_immBlock_pred(block, jmp);
-       }
        set_unreachable_now();
 }
 
@@ -5194,7 +5191,7 @@ static void asm_statement_to_firm(const asm_statement_t *statement)
                        ir_asm_constraint constraint;
                        constraint.pos              = pos;
                        constraint.constraint       = new_id_from_str(constraints);
-                       constraint.mode             = NULL;
+                       constraint.mode             = mode_M;
                        tmp_in_constraints[in_size] = constraint;
 
                        ins[in_size]          = expression_to_addr(expr);
@@ -5336,70 +5333,36 @@ static void leave_statement_to_firm(leave_statement_t *statement)
 /**
  * Transform a statement.
  */
-static void statement_to_firm(statement_t *statement)
+static void statement_to_firm(statement_t *const stmt)
 {
 #ifndef NDEBUG
-       assert(!statement->base.transformed);
-       statement->base.transformed = true;
+       assert(!stmt->base.transformed);
+       stmt->base.transformed = true;
 #endif
 
-       switch (statement->kind) {
-       case STATEMENT_ERROR:
-               panic("error statement found");
-       case STATEMENT_EMPTY:
-               /* nothing */
-               return;
-       case STATEMENT_COMPOUND:
-               compound_statement_to_firm(&statement->compound);
-               return;
-       case STATEMENT_RETURN:
-               return_statement_to_firm(&statement->returns);
-               return;
-       case STATEMENT_EXPRESSION:
-               expression_statement_to_firm(&statement->expression);
-               return;
-       case STATEMENT_IF:
-               if_statement_to_firm(&statement->ifs);
-               return;
-       case STATEMENT_WHILE:
-               while_statement_to_firm(&statement->whiles);
-               return;
-       case STATEMENT_DO_WHILE:
-               do_while_statement_to_firm(&statement->do_while);
-               return;
-       case STATEMENT_DECLARATION:
-               declaration_statement_to_firm(&statement->declaration);
-               return;
-       case STATEMENT_BREAK:
-               create_jump_statement(statement, get_break_label());
-               return;
-       case STATEMENT_CONTINUE:
-               create_jump_statement(statement, continue_label);
-               return;
-       case STATEMENT_SWITCH:
-               switch_statement_to_firm(&statement->switchs);
-               return;
-       case STATEMENT_CASE_LABEL:
-               case_label_to_firm(&statement->case_label);
-               return;
-       case STATEMENT_FOR:
-               for_statement_to_firm(&statement->fors);
-               return;
-       case STATEMENT_LABEL:
-               label_to_firm(&statement->label);
-               return;
-       case STATEMENT_GOTO:
-               goto_to_firm(&statement->gotos);
-               return;
-       case STATEMENT_ASM:
-               asm_statement_to_firm(&statement->asms);
-               return;
-       case STATEMENT_MS_TRY:
-               ms_try_statement_to_firm(&statement->ms_try);
-               return;
-       case STATEMENT_LEAVE:
-               leave_statement_to_firm(&statement->leave);
-               return;
+       switch (stmt->kind) {
+       case STATEMENT_ASM:           asm_statement_to_firm(        &stmt->asms);          return;
+       case STATEMENT_CASE_LABEL:    case_label_to_firm(           &stmt->case_label);    return;
+       case STATEMENT_COMPOUND:      compound_statement_to_firm(   &stmt->compound);      return;
+       case STATEMENT_COMPUTED_GOTO: computed_goto_to_firm(        &stmt->computed_goto); return;
+       case STATEMENT_DECLARATION:   declaration_statement_to_firm(&stmt->declaration);   return;
+       case STATEMENT_DO_WHILE:      do_while_statement_to_firm(   &stmt->do_while);      return;
+       case STATEMENT_EMPTY:         /* nothing */                                        return;
+       case STATEMENT_EXPRESSION:    expression_statement_to_firm( &stmt->expression);    return;
+       case STATEMENT_FOR:           for_statement_to_firm(        &stmt->fors);          return;
+       case STATEMENT_IF:            if_statement_to_firm(         &stmt->ifs);           return;
+       case STATEMENT_LABEL:         label_to_firm(                &stmt->label);         return;
+       case STATEMENT_LEAVE:         leave_statement_to_firm(      &stmt->leave);         return;
+       case STATEMENT_MS_TRY:        ms_try_statement_to_firm(     &stmt->ms_try);        return;
+       case STATEMENT_RETURN:        return_statement_to_firm(     &stmt->returns);       return;
+       case STATEMENT_SWITCH:        switch_statement_to_firm(     &stmt->switchs);       return;
+       case STATEMENT_WHILE:         while_statement_to_firm(      &stmt->whiles);        return;
+
+       case STATEMENT_BREAK:         create_jump_statement(stmt, get_break_label());                  return;
+       case STATEMENT_CONTINUE:      create_jump_statement(stmt, continue_label);                     return;
+       case STATEMENT_GOTO:          create_jump_statement(stmt, get_label_block(stmt->gotos.label)); return;
+
+       case STATEMENT_ERROR: panic("error statement found");
        }
        panic("statement not implemented");
 }
@@ -5540,7 +5503,7 @@ static void initialize_function_parameters(entity_t *entity)
  * @param irg            the IR-graph
  * @param dec_modifiers  additional modifiers
  */
-static void handle_decl_modifier_irg(ir_graph_ptr irg,
+static void handle_decl_modifier_irg(ir_graph *irg,
                                      decl_modifiers_t decl_modifiers)
 {
        if (decl_modifiers & DM_NAKED) {
@@ -5642,8 +5605,6 @@ static void create_function(entity_t *entity)
        set_irn_dbg_info(get_irg_start_block(irg),
                         get_entity_dbg_info(function_entity));
 
-       ir_node *first_block = get_cur_block();
-
        /* set inline flags */
        if (entity->function.is_inline)
                set_irg_inline_property(irg, irg_inline_recomended);
@@ -5688,30 +5649,17 @@ static void create_function(entity_t *entity)
                add_immBlock_pred(end_block, ret);
        }
 
-       bool has_computed_gotos = false;
        for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) {
                label_t *label = all_labels[i];
                if (label->address_taken) {
                        gen_ijmp_branches(label->block);
-                       has_computed_gotos = true;
                }
                mature_immBlock(label->block);
        }
-       if (has_computed_gotos) {
-               /* if we have computed goto's in the function, we cannot inline it */
-               if (get_irg_inline_property(irg) >= irg_inline_recomended) {
-                       source_position_t const *const pos = &entity->base.source_position;
-                       warningf(WARN_OTHER, pos, "'%N' can never be inlined because it contains a computed goto", entity);
-               }
-               set_irg_inline_property(irg, irg_inline_forbidden);
-       }
 
        DEL_ARR_F(all_labels);
        all_labels = NULL;
 
-       mature_immBlock(first_block);
-       mature_immBlock(end_block);
-
        irg_finalize_cons(irg);
 
        /* finalize the frame type */