Use fputc() instead of fputs() to print a single char.
[cparser] / ast2firm.c
index 32e5e57..f1dc45c 100644 (file)
@@ -53,18 +53,20 @@ static ir_type *ir_type_wchar_t;
 static ir_type *ir_type_void;
 static ir_type *ir_type_int;
 
-static int       next_value_number_function;
-static ir_node  *continue_label;
-static ir_node  *break_label;
-static ir_node  *current_switch_cond;
-static bool      saw_default_label;
-static ir_node **imature_blocks;
-static bool constant_folding;
+static int             next_value_number_function;
+static ir_node        *continue_label;
+static ir_node        *break_label;
+static ir_node        *current_switch_cond;
+static bool            saw_default_label;
+static declaration_t **all_labels;
+static ir_node        *ijmp_list;
+static bool            constant_folding;
 
 static const declaration_t *current_function_decl;
 static ir_node             *current_function_name;
 static ir_node             *current_funcsig;
 static switch_statement_t  *current_switch;
+static ir_graph            *current_function;
 
 static entitymap_t  entitymap;
 
@@ -528,7 +530,7 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
        assert(base->kind == TYPE_ATOMIC || base->kind == TYPE_ENUM);
        ir_type *irbase = get_ir_type(base);
 
-       unsigned size = fold_constant(type->size);
+       unsigned size = type->bit_size;
 
        assert(!is_type_float(base));
        if (is_type_signed(base)) {
@@ -648,7 +650,7 @@ static ir_type *create_compound_type(compound_type_t *type, ir_type *irtype,
                size_t base;
                size_t bits_remainder;
                if (entry_type->kind == TYPE_BITFIELD) {
-                       size_t size_bits      = fold_constant(entry_type->bitfield.size);
+                       size_t size_bits      = entry_type->bitfield.bit_size;
                        size_t rest_size_bits = (entry_alignment - misalign)*8 - bit_offset;
 
                        if (size_bits > rest_size_bits) {
@@ -805,7 +807,9 @@ static ir_type *get_ir_type(type_t *type)
        ir_type *firm_type = NULL;
        switch (type->kind) {
        case TYPE_ERROR:
-               panic("error type occurred");
+               /* Happens while constant folding, when there was an error */
+               return create_atomic_type(&type_void->atomic);
+
        case TYPE_ATOMIC:
                firm_type = create_atomic_type(&type->atomic);
                break;
@@ -1388,6 +1392,18 @@ static ir_node *create_conv(dbg_info *dbgi, ir_node *value, ir_mode *dest_mode)
        return new_d_Conv(dbgi, value, dest_mode);
 }
 
+/**
+ * Keep all memory edges of the given block.
+ */
+static void keep_all_memory(ir_node *block) {
+       ir_node *old = get_cur_block();
+
+       set_cur_block(block);
+       keep_alive(get_store());
+       /* TODO: keep all memory edges from restricted pointers */
+       set_cur_block(old);
+}
+
 static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
 {
        dbg_info      *dbgi        = get_dbg_info(&ref->base.source_position);
@@ -1397,7 +1413,7 @@ static ir_node *reference_expression_to_firm(const reference_expression_t *ref)
        /* make sure the type is constructed */
        (void) get_ir_type(type);
 
-       switch((declaration_kind_t) declaration->declaration_kind) {
+       switch ((declaration_kind_t)declaration->declaration_kind) {
        case DECLARATION_KIND_TYPE:
        case DECLARATION_KIND_UNKNOWN:
                break;
@@ -1566,17 +1582,17 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                        if (declaration->v.entity == rts_entities[rts_alloca]) {
                                /* handle alloca() call */
                                expression_t *argument = call->arguments->expression;
-                               ir_node      *size     = expression_to_firm(argument);
+                               ir_node      *size     = expression_to_firm(argument);
 
-                               size = create_conv(dbgi, size, get_ir_mode(type_size_t));
+                               size = create_conv(dbgi, size, get_ir_mode(type_size_t));
 
-                               ir_node *store  = get_store();
-                               dbg_info *dbgi  = get_dbg_info(&call->base.source_position);
-                               ir_node *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type,
-                                              stack_alloc);
-                               ir_node *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M);
+                               ir_node  *store  = get_store();
+                               dbg_info *dbgi   = get_dbg_info(&call->base.source_position);
+                               ir_node  *alloca = new_d_Alloc(dbgi, store, size, firm_unknown_type,
+                                                              stack_alloc);
+                               ir_node  *proj_m = new_Proj(alloca, mode_M, pn_Alloc_M);
                                set_store(proj_m);
-                               ir_node *res    = new_Proj(alloca, mode_P_data, pn_Alloc_res);
+                               ir_node  *res    = new_Proj(alloca, mode_P_data, pn_Alloc_res);
 
                                return res;
                        }
@@ -1662,6 +1678,15 @@ static ir_node *call_expression_to_firm(const call_expression_t *call)
                result           = new_d_Proj(dbgi, resproj, mode, 0);
        }
 
+       if (function->kind == EXPR_REFERENCE &&
+           function->reference.declaration->modifiers & DM_NORETURN) {
+               /* A dead end:  Keep the Call and the Block.  Also place all further
+                * nodes into a new and unreachable block. */
+               keep_alive(node);
+               keep_alive(get_cur_block());
+               new_Block(0, NULL);
+       }
+
        return result;
 }
 
@@ -1669,9 +1694,9 @@ static void statement_to_firm(statement_t *statement);
 static ir_node *compound_statement_to_firm(compound_statement_t *compound);
 
 static ir_node *expression_to_addr(const expression_t *expression);
-static void create_condition_evaluation(const expression_t *expression,
-                                        ir_node *true_block,
-                                        ir_node *false_block);
+static ir_node *create_condition_evaluation(const expression_t *expression,
+                                            ir_node *true_block,
+                                            ir_node *false_block);
 
 static void assign_value(dbg_info *dbgi, ir_node *addr, type_t *type,
                          ir_node *value)
@@ -2131,10 +2156,8 @@ static ir_node *produce_condition_result(const expression_t *expression,
        mature_immBlock(one_block);
        mature_immBlock(zero_block);
 
-       ir_node *common_block = new_immBlock();
-       add_immBlock_pred(common_block, jmp_one);
-       add_immBlock_pred(common_block, jmp_zero);
-       mature_immBlock(common_block);
+       ir_node *in_cf[2] = { jmp_one, jmp_zero };
+       new_Block(2, in_cf);
 
        ir_node *in[2] = { one, zero };
        ir_node *val   = new_d_Phi(dbgi, 2, in, mode);
@@ -2311,9 +2334,9 @@ static ir_node *create_assign_binop(const binary_expression_t *expression)
        dbg_info *const     dbgi = get_dbg_info(&expression->base.source_position);
        const expression_t *left_expr = expression->left;
        ir_mode            *left_mode = get_ir_mode(left_expr->base.type);
+       ir_node            *right     = expression_to_firm(expression->right);
        ir_node            *left_addr = expression_to_addr(left_expr);
        ir_node            *left      = get_value_from_lvalue(left_expr, left_addr);
-       ir_node            *right     = expression_to_firm(expression->right);
        ir_node            *result    = create_op(dbgi, expression, left, right);
 
        result = create_conv(dbgi, result, left_mode);
@@ -2571,6 +2594,7 @@ static ir_node *alignof_to_firm(const typeprop_expression_t *expression)
 }
 
 static void init_ir_types(void);
+
 long fold_constant(const expression_t *expression)
 {
        bool constant_folding_old = constant_folding;
@@ -2610,7 +2634,10 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        if (is_constant_expression(expression->condition)) {
                long val = fold_constant(expression->condition);
                if (val) {
-                       return expression_to_firm(expression->true_expression);
+                       expression_t *true_expression = expression->true_expression;
+                       if (true_expression == NULL)
+                               true_expression = expression->condition;
+                       return expression_to_firm(true_expression);
                } else {
                        return expression_to_firm(expression->false_expression);
                }
@@ -2621,7 +2648,8 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
        /* create the true block */
        ir_node *true_block  = new_immBlock();
 
-       ir_node *true_val = expression_to_firm(expression->true_expression);
+       ir_node *true_val = expression->true_expression != NULL ?
+               expression_to_firm(expression->true_expression) : NULL;
        ir_node *true_jmp = new_Jmp();
 
        /* create the false block */
@@ -2632,15 +2660,23 @@ static ir_node *conditional_to_firm(const conditional_expression_t *expression)
 
        /* create the condition evaluation */
        set_cur_block(cur_block);
-       create_condition_evaluation(expression->condition, true_block, false_block);
+       ir_node *const cond_expr = create_condition_evaluation(expression->condition, true_block, false_block);
+       if (expression->true_expression == NULL) {
+               if (cond_expr != NULL) {
+                       true_val = cond_expr;
+               } else {
+                       /* Condition ended with a short circuit (&&, ||, !) operation.
+                        * Generate a "1" as value for the true branch. */
+                       ir_mode *const mode = mode_Is;
+                       true_val = new_Const(mode, get_mode_one(mode));
+               }
+       }
        mature_immBlock(true_block);
        mature_immBlock(false_block);
 
        /* create the common block */
-       ir_node *common_block = new_immBlock();
-       add_immBlock_pred(common_block, true_jmp);
-       add_immBlock_pred(common_block, false_jmp);
-       mature_immBlock(common_block);
+       ir_node *in_cf[2] = { true_jmp, false_jmp };
+       new_Block(2, in_cf);
 
        /* TODO improve static semantics, so either both or no values are NULL */
        if (true_val == NULL || false_val == NULL)
@@ -2920,6 +2956,52 @@ static ir_node *builtin_prefetch_to_firm(
        return NULL;
 }
 
+static ir_node *get_label_block(declaration_t *label)
+{
+       assert(label->namespc == NAMESPACE_LABEL || label->namespc == NAMESPACE_LOCAL_LABEL);
+
+       if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) {
+               return label->v.block;
+       }
+       assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN);
+
+       /* beware: might be called from create initializer with current_ir_graph
+        * set to const_code_irg. */
+       ir_graph *rem    = current_ir_graph;
+       current_ir_graph = current_function;
+
+       ir_node *old_cur_block = get_cur_block();
+       ir_node *block         = new_immBlock();
+       set_cur_block(old_cur_block);
+
+       label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK;
+       label->v.block          = block;
+
+       ARR_APP1(declaration_t *, all_labels, label);
+
+       current_ir_graph = rem;
+       return block;
+}
+
+/**
+ * Pointer to a label.  This is used for the
+ * GNU address-of-label extension.
+ */
+static ir_node *label_address_to_firm(
+               const label_address_expression_t *label)
+{
+       ir_node    *block = get_label_block(label->declaration);
+       ir_label_t  nr    = get_Block_label(block);
+
+       if (nr == 0) {
+               nr = get_irp_next_label_nr();
+               set_Block_label(block, nr);
+       }
+       symconst_symbol value;
+       value.label = nr;
+       return new_SymConst(mode_P_code, value, symconst_label);
+}
+
 /**
  * creates firm nodes for an expression. The difference between this function
  * and expression_to_firm is, that this version might produce mode_b nodes
@@ -2934,7 +3016,7 @@ static ir_node *_expression_to_firm(const expression_t *expression)
        }
 #endif
 
-       switch(expression->kind) {
+       switch (expression->kind) {
        case EXPR_CHARACTER_CONSTANT:
                return character_constant_to_firm(&expression->conste);
        case EXPR_WIDE_CHARACTER_CONSTANT:
@@ -2983,6 +3065,8 @@ static ir_node *_expression_to_firm(const expression_t *expression)
                return offsetof_to_firm(&expression->offsetofe);
        case EXPR_COMPOUND_LITERAL:
                return compound_literal_to_firm(&expression->compound_literal);
+       case EXPR_LABEL_ADDRESS:
+               return label_address_to_firm(&expression->label_address);
 
        case EXPR_UNKNOWN:
        case EXPR_INVALID:
@@ -3043,28 +3127,20 @@ static ir_node *expression_to_firm(const expression_t *expression)
        return produce_condition_result(expression, dbgi);
 }
 
-static ir_node *expression_to_modeb(const expression_t *expression)
-{
-       ir_node *res = _expression_to_firm(expression);
-       res          = create_conv(NULL, res, mode_b);
-
-       return res;
-}
-
 /**
  * create a short-circuit expression evaluation that tries to construct
  * efficient control flow structures for &&, || and ! expressions
  */
-static void create_condition_evaluation(const expression_t *expression,
-                                        ir_node *true_block,
-                                        ir_node *false_block)
+static ir_node *create_condition_evaluation(const expression_t *expression,
+                                            ir_node *true_block,
+                                            ir_node *false_block)
 {
        switch(expression->kind) {
        case EXPR_UNARY_NOT: {
                const unary_expression_t *unary_expression = &expression->unary;
                create_condition_evaluation(unary_expression->value, false_block,
                                            true_block);
-               return;
+               return NULL;
        }
        case EXPR_BINARY_LOGICAL_AND: {
                const binary_expression_t *binary_expression = &expression->binary;
@@ -3078,7 +3154,7 @@ static void create_condition_evaluation(const expression_t *expression,
                set_cur_block(extra_block);
                create_condition_evaluation(binary_expression->right, true_block,
                                            false_block);
-               return;
+               return NULL;
        }
        case EXPR_BINARY_LOGICAL_OR: {
                const binary_expression_t *binary_expression = &expression->binary;
@@ -3092,14 +3168,15 @@ static void create_condition_evaluation(const expression_t *expression,
                set_cur_block(extra_block);
                create_condition_evaluation(binary_expression->right, true_block,
                                            false_block);
-               return;
+               return NULL;
        }
        default:
                break;
        }
 
        dbg_info *dbgi       = get_dbg_info(&expression->base.source_position);
-       ir_node  *condition  = expression_to_modeb(expression);
+       ir_node  *cond_expr  = _expression_to_firm(expression);
+       ir_node  *condition  = create_conv(NULL, cond_expr, mode_b);
        ir_node  *cond       = new_d_Cond(dbgi, condition);
        ir_node  *true_proj  = new_d_Proj(dbgi, cond, mode_X, pn_Cond_true);
        ir_node  *false_proj = new_d_Proj(dbgi, cond, mode_X, pn_Cond_false);
@@ -3123,6 +3200,7 @@ static void create_condition_evaluation(const expression_t *expression,
        }
 
        set_cur_block(NULL);
+       return cond_expr;
 }
 
 
@@ -4167,7 +4245,7 @@ static void if_statement_to_firm(if_statement_t *statement)
        }
 
        mature_immBlock(true_block);
-       if (false_block != fallthrough_block) {
+       if (false_block != fallthrough_block && false_block != NULL) {
                mature_immBlock(false_block);
        }
        if (fallthrough_block != NULL) {
@@ -4217,6 +4295,8 @@ static void while_statement_to_firm(while_statement_t *statement)
                add_immBlock_pred(body_block, header_jmp);
 
                keep_alive(body_block);
+               keep_all_memory(body_block);
+               set_cur_block(body_block);
        } else {
                if (false_block == NULL) {
                        false_block = new_immBlock();
@@ -4298,12 +4378,13 @@ static void for_statement_to_firm(for_statement_t *statement)
        for( ; declaration != NULL; declaration = declaration->next) {
                create_local_declaration(declaration);
        }
-       declaration = statement->scope.declarations;
-       for( ; declaration != NULL; declaration = declaration->next) {
-               initialize_local_declaration(declaration);
-       }
 
        if (get_cur_block() != NULL) {
+               declaration = statement->scope.declarations;
+               for( ; declaration != NULL; declaration = declaration->next) {
+                       initialize_local_declaration(declaration);
+               }
+
                if (statement->initialisation != NULL) {
                        expression_to_firm(statement->initialisation);
                }
@@ -4360,6 +4441,7 @@ static void for_statement_to_firm(for_statement_t *statement)
                                            false_block);
        } else {
                keep_alive(header_block);
+               keep_all_memory(header_block);
                jmp = new_Jmp();
                add_immBlock_pred(body_block, jmp);
        }
@@ -4422,8 +4504,8 @@ static void switch_statement_to_firm(switch_statement_t *statement)
                        /* default case */
                        continue;
                }
-               for (long cns = l->first_case; cns <= l->last_case; ++cns)
-                       ++num_cases;
+               if (l->last_case >= l->first_case)
+                       num_cases += l->last_case - l->first_case;
                if (l->last_case > def_nr)
                        def_nr = l->last_case;
        }
@@ -4493,7 +4575,7 @@ static void switch_statement_to_firm(switch_statement_t *statement)
 
 static void case_label_to_firm(const case_label_statement_t *statement)
 {
-       if (statement->is_empty)
+       if (statement->is_empty_range)
                return;
 
        dbg_info *dbgi = get_dbg_info(&statement->base.source_position);
@@ -4506,14 +4588,14 @@ static void case_label_to_firm(const case_label_statement_t *statement)
 
        set_cur_block(old_block);
        if (statement->expression != NULL) {
-               long start_pn = statement->first_case;
-               long end_pn   = statement->last_case;
-               assert(start_pn <= end_pn);
+               long pn     = statement->first_case;
+               long end_pn = statement->last_case;
+               assert(pn <= end_pn);
                /* create jumps for all cases in the given range */
-               for (long pn = start_pn; pn <= end_pn; ++pn) {
+               do {
                        proj = new_d_Proj(dbgi, current_switch_cond, mode_X, pn);
                        add_immBlock_pred(block, proj);
-               }
+               } while(pn++ < end_pn);
        } else {
                saw_default_label = true;
                proj = new_d_defaultProj(dbgi, current_switch_cond,
@@ -4533,27 +4615,6 @@ static void case_label_to_firm(const case_label_statement_t *statement)
        }
 }
 
-static ir_node *get_label_block(declaration_t *label)
-{
-       assert(label->namespc == NAMESPACE_LABEL);
-
-       if (label->declaration_kind == DECLARATION_KIND_LABEL_BLOCK) {
-               return label->v.block;
-       }
-       assert(label->declaration_kind == DECLARATION_KIND_UNKNOWN);
-
-       ir_node *old_cur_block = get_cur_block();
-       ir_node *block         = new_immBlock();
-       set_cur_block(old_cur_block);
-
-       label->declaration_kind = DECLARATION_KIND_LABEL_BLOCK;
-       label->v.block          = block;
-
-       ARR_APP1(ir_node *, imature_blocks, block);
-
-       return block;
-}
-
 static void label_to_firm(const label_statement_t *statement)
 {
        ir_node *block = get_label_block(statement->label);
@@ -4565,6 +4626,7 @@ static void label_to_firm(const label_statement_t *statement)
 
        set_cur_block(block);
        keep_alive(block);
+       keep_all_memory(block);
 
        if (statement->statement != NULL) {
                statement_to_firm(statement->statement);
@@ -4576,10 +4638,18 @@ static void goto_to_firm(const goto_statement_t *statement)
        if (get_cur_block() == NULL)
                return;
 
-       ir_node *block = get_label_block(statement->label);
-       ir_node *jmp   = new_Jmp();
-       add_immBlock_pred(block, jmp);
+       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);
 
+               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_cur_block(NULL);
 }
 
@@ -5011,6 +5081,7 @@ static int count_decls_in_expression(const expression_t *expression) {
        case EXPR_BUILTIN_SYMBOL:
        case EXPR_VA_START:
        case EXPR_VA_ARG:
+       case EXPR_LABEL_ADDRESS:
                break;
        }
 
@@ -5249,6 +5320,16 @@ static void add_function_pointer(ir_type *segment, ir_entity *method,
        set_atomic_ent_value(ptr, val);
 }
 
+/**
+ * Generate possible IJmp branches to a given label block.
+ */
+static void gen_ijmp_branches(ir_node *block) {
+       ir_node *ijmp;
+       for (ijmp = ijmp_list; ijmp != NULL; ijmp = get_irn_link(ijmp)) {
+               add_immBlock_pred(block, ijmp);
+       }
+}
+
 /**
  * Create code for a function.
  */
@@ -5272,12 +5353,16 @@ static void create_function(declaration_t *declaration)
        current_function_name = NULL;
        current_funcsig       = NULL;
 
-       assert(imature_blocks == NULL);
-       imature_blocks = NEW_ARR_F(ir_node*, 0);
+       assert(all_labels == NULL);
+       all_labels = NEW_ARR_F(declaration_t *, 0);
+       ijmp_list  = NULL;
 
        int       n_local_vars = get_function_n_local_vars(declaration);
        ir_graph *irg          = new_ir_graph(function_entity, n_local_vars);
 
+       ir_graph *old_current_function = current_function;
+       current_function = irg;
+
        set_irg_fp_model(irg, firm_opt.fp_model);
        tarval_enable_fp_ops((firm_opt.fp_model & fp_strict_algebraic) == 0);
        set_irn_dbg_info(get_irg_start_block(irg), get_entity_dbg_info(function_entity));
@@ -5327,11 +5412,27 @@ static void create_function(declaration_t *declaration)
                add_immBlock_pred(end_block, ret);
        }
 
-       for(int i = 0; i < ARR_LEN(imature_blocks); ++i) {
-               mature_immBlock(imature_blocks[i]);
+       bool has_computed_gotos = false;
+       for (int i = ARR_LEN(all_labels) - 1; i >= 0; --i) {
+               declaration_t *label = all_labels[i];
+               if (label->address_taken) {
+                       gen_ijmp_branches(label->v.block);
+                       has_computed_gotos = true;
+               }
+               mature_immBlock(label->v.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) {
+                       warningf(&declaration->source_position,
+                               "function '%Y' can never be inlined because it contains a computed goto",
+                               declaration->symbol);
+               }
+               set_irg_inline_property(irg, irg_inline_forbidden);
        }
-       DEL_ARR_F(imature_blocks);
-       imature_blocks = NULL;
+
+       DEL_ARR_F(all_labels);
+       all_labels = NULL;
 
        mature_immBlock(first_block);
        mature_immBlock(end_block);
@@ -5365,6 +5466,7 @@ static void create_function(declaration_t *declaration)
        set_type_alignment_bytes(frame_type, align_all);
 
        irg_vrfy(irg);
+       current_function = old_current_function;
 }
 
 static void scope_to_firm(scope_t *scope)
@@ -5411,6 +5513,12 @@ static void scope_to_firm(scope_t *scope)
        }
 }
 
+static void set_be_option(const char *option)
+{
+       int res = firm_be_option(option);
+       assert(res);
+}
+
 void init_ast2firm(void)
 {
        obstack_init(&asm_obst);
@@ -5420,24 +5528,22 @@ void init_ast2firm(void)
        id_imp        = new_id_from_chars("__imp_", 6);
 
        /* OS option must be set to the backend */
-       const char *s = "ia32-gasmode=linux";
        switch (firm_opt.os_support) {
        case OS_SUPPORT_MINGW:
                create_ld_ident = create_ld_ident_win32;
-               s = "ia32-gasmode=mingw";
+               set_be_option("ia32-gasmode=mingw");
                break;
        case OS_SUPPORT_LINUX:
                create_ld_ident = create_ld_ident_linux_elf;
-               s = "ia32-gasmode=elf";
+               set_be_option("ia32-gasmode=elf");
                break;
        case OS_SUPPORT_MACHO:
                create_ld_ident = create_ld_ident_macho;
-               s = "ia32-gasmode=macho";
+               set_be_option("ia32-gasmode=macho");
+               set_be_option("ia32-stackalign=4");
+               set_be_option("pic");
                break;
        }
-       int res = firm_be_option(s);
-       (void) res;
-       assert(res);
 
        /* create idents for all known runtime functions */
        for (size_t i = 0; i < sizeof(rts_data) / sizeof(rts_data[0]); ++i) {
@@ -5454,9 +5560,6 @@ static void init_ir_types(void)
                return;
        ir_types_initialized = 1;
 
-       type_void       = make_atomic_type(ATOMIC_TYPE_VOID, TYPE_QUALIFIER_NONE);
-       type_int        = make_atomic_type(ATOMIC_TYPE_INT,  TYPE_QUALIFIER_NONE);
-
        ir_type_int        = get_ir_type(type_int);
        ir_type_const_char = get_ir_type(type_const_char);
        ir_type_wchar_t    = get_ir_type(type_wchar_t);
@@ -5497,4 +5600,6 @@ void translation_unit_to_firm(translation_unit_t *unit)
 
        scope_to_firm(&unit->scope);
        global_asm_to_firm(unit->global_asm);
+
+       current_ir_graph = NULL;
 }