X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_union.c;h=1d24f95e5f9d3dd45a989de69eb67a3f151639b9;hb=f4bc73294ddd9f00ba656a8cf81593f83fbcadba;hp=f3299976d53eaf9c3e393a5fbf512ac7769622d6;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84;p=m6w6%2Fext-psi

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index f329997..1d24f95 100644
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -74,11 +74,17 @@ 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;
+	}
+	psi_validate_stack_add_union(type_stack, u->name, u);
+
 	if (!u->size && !psi_plist_count(u->args)) {
 		data->error(data, u->token, PSI_WARNING,
 				"Cannot compute size of empty union %s", u->name);
@@ -88,11 +94,11 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *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)) {
 			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 +120,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;