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

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index 1d24f95..1e5c1c7 100644
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -83,7 +83,6 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
 	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,
@@ -91,10 +90,13 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
 		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, type_stack)) {
+			psi_validate_stack_del_union(type_stack, u->name);
 			return false;
 		}
 
@@ -147,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;
 }