Split computed gotos (STATEMENT_COMPUTED_GOTO) from normal goto statements.

[cparser] / ast2firm.c

diff --git a/ast2firm.c b/ast2firm.c
index d34289b..c6b9796 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -1726,7 +1726,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);
@@ -2953,7 +2953,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:
@@ -3005,6 +3005,10 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression)
 
        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();
 
@@ -3015,6 +3019,8 @@ static ir_tarval *fold_constant_to_tarval(const expression_t *expression)
 
        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");
@@ -3457,7 +3463,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",
@@ -3470,9 +3476,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);
@@ -5084,23 +5090,30 @@ static void label_to_firm(const label_statement_t *statement)
        statement_to_firm(statement->statement);
 }
 
+static void computed_goto_to_firm(computed_goto_statement_t const *const statement)
+{
+       if (!currently_reachable())
+               return;
+
+       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_unreachable_now();
+}
+
 static void goto_to_firm(const goto_statement_t *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 *block = get_label_block(statement->label);
+       ir_node *jmp   = new_Jmp();
+       add_immBlock_pred(block, jmp);
 
-               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();
 }
 
@@ -5413,6 +5426,9 @@ static void statement_to_firm(statement_t *statement)
        case STATEMENT_LABEL:
                label_to_firm(&statement->label);
                return;
+       case STATEMENT_COMPUTED_GOTO:
+               computed_goto_to_firm(&statement->computed_goto);
+               return;
        case STATEMENT_GOTO:
                goto_to_firm(&statement->gotos);
                return;
@@ -5667,8 +5683,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);
@@ -5724,9 +5738,6 @@ static void create_function(entity_t *entity)
        DEL_ARR_F(all_labels);
        all_labels = NULL;
 
-       mature_immBlock(first_block);
-       mature_immBlock(end_block);
-
        irg_finalize_cons(irg);
 
        /* finalize the frame type */