avoid construct 2 struct types for the same struct in firm

[r18806]

diff --git a/ast2firm.c b/ast2firm.c
index d830f89..f7f5727 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -541,7 +541,12 @@ static ir_type *create_bitfield_type(bitfield_type_t *const type)
 
 static ir_type *create_struct_type(compound_type_t *type)
 {
-       symbol_t *symbol = type->declaration->symbol;
+       declaration_t *declaration = type->declaration;
+       if(declaration->v.irtype != NULL) {
+               return declaration->v.irtype;
+       }
+
+       symbol_t *symbol = declaration->symbol;
        ident    *id;
        if(symbol != NULL) {
                id = unique_ident(symbol->string);
@@ -556,7 +561,7 @@ static ir_type *create_struct_type(compound_type_t *type)
        size_t align_all  = 1;
        size_t offset     = 0;
        size_t bit_offset = 0;
-       declaration_t *entry = type->declaration->scope.declarations;
+       declaration_t *entry = declaration->scope.declarations;
        for( ; entry != NULL; entry = entry->next) {
                if(entry->namespc != NAMESPACE_NORMAL)
                        continue;
@@ -641,12 +646,18 @@ static ir_type *create_struct_type(compound_type_t *type)
        set_type_size_bytes(irtype, offset);
        set_type_state(irtype, layout_fixed);
 
+       declaration->v.irtype = irtype;
+
        return irtype;
 }
 
 static ir_type *create_union_type(compound_type_t *type)
 {
        declaration_t *declaration = type->declaration;
+       if(declaration->v.irtype != NULL) {
+               return declaration->v.irtype;
+       }
+
        symbol_t      *symbol      = declaration->symbol;
        ident         *id;
        if(symbol != NULL) {
@@ -678,6 +689,7 @@ static ir_type *create_union_type(compound_type_t *type)
                add_union_member(irtype, entity);
                set_entity_offset(entity, 0);
                entry->declaration_kind = DECLARATION_KIND_COMPOUND_MEMBER;
+               assert(entry->v.entity == NULL);
                entry->v.entity         = entity;
 
                if(entry_size > size) {
@@ -695,6 +707,8 @@ static ir_type *create_union_type(compound_type_t *type)
        set_type_size_bytes(irtype, size);
        set_type_state(irtype, layout_fixed);
 
+       declaration->v.irtype = irtype;
+
        return irtype;
 }
 

diff --git a/ast_t.h b/ast_t.h
index 915181a..31cd404 100644 (file)
--- a/ast_t.h
+++ b/ast_t.h
@@ -416,6 +416,7 @@ struct declaration_t {
                ir_entity      *entity;
                ir_node        *block;
                tarval         *enum_val;
+               ir_type        *irtype;
        } v;
 };
 

diff --git a/parsetest/cp_error011.c b/parsetest/cp_error011.c
index 1e79a1d..f124cdf 100644 (file)
--- a/parsetest/cp_error011.c
+++ b/parsetest/cp_error011.c
@@ -5,3 +5,7 @@ void f(void)
 {
        const struct bla x = { 0 };
 }
+
+int main(void) {
+       return 0;
+}