validate: fix type stack and leaks

[m6w6/ext-psi] / src / types / decl_union.c

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index f3299976d53eaf9c3e393a5fbf512ac7769622d6..1e5c1c774473631fd78211a9c6d2a507e54a8af6 100644 (file)
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -74,25 +74,33 @@ struct psi_decl_arg *psi_decl_union_get_arg(struct psi_decl_union *u,
        return NULL;
 }
 
-bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
+bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
+               struct psi_validate_stack *type_stack)
 {
        size_t i, pos, len, size = 0, align;
        struct psi_decl_arg *darg;
 
+       if (psi_validate_stack_has_union(type_stack, u->name)) {
+               return true;
+       }
+
        if (!u->size && !psi_plist_count(u->args)) {
                data->error(data, u->token, PSI_WARNING,
                                "Cannot compute size of empty union %s", u->name);
                return false;
        }
 
+       psi_validate_stack_add_union(type_stack, u->name, u);
+
        for (i = 0; psi_plist_get(u->args, i, &darg); ++i) {
                darg->var->arg = darg;
 
-               if (!psi_decl_arg_validate(data, darg)) {
+               if (!psi_decl_arg_validate(data, darg, type_stack)) {
+                       psi_validate_stack_del_union(type_stack, u->name);
                        return false;
                }
 
-               if (darg->layout) {
+               if (darg->layout && darg->layout->len) {
                        pos = darg->layout->pos;
 
                        align = psi_decl_arg_align(darg, &pos, &len);
@@ -114,7 +122,18 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
                        pos = 0;
 
                        align = psi_decl_arg_align(darg, &pos, &len);
-                       darg->layout = psi_layout_init(pos, len);
+
+                       if (darg->layout) {
+                               if (darg->layout->pos != 0) {
+                                       data->error(data, darg->token, PSI_WARNING,
+                                                       "Offset of %s.%s should be 0", u->name,
+                                                       darg->var->name);
+                                       darg->layout->pos = 0;
+                               }
+                               darg->layout->len = len;
+                       } else {
+                               darg->layout = psi_layout_init(pos, len, NULL);
+                       }
                }
                if (len > size) {
                        size = len;
@@ -130,6 +149,8 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
                u->size = psi_align(size, u->align);
        }
 
+       assert(u->size);
+
        return true;
 }