[src/trunk]: src/usr.bin/xlint/lint1 - handle sizes of structs/unions with an...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/509d8cbf0d74
branches:  trunk
changeset: 347223:509d8cbf0d74
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 18 14:43:31 2016 +0000

description:
- handle sizes of structs/unions with anon members
- handle structs/unions with only anon members

diffstat:

 usr.bin/xlint/lint1/decl.c |  34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diffs (59 lines):

diff -r 5746c47a7a54 -r 509d8cbf0d74 usr.bin/xlint/lint1/decl.c
--- a/usr.bin/xlint/lint1/decl.c        Thu Aug 18 14:42:48 2016 +0000
+++ b/usr.bin/xlint/lint1/decl.c        Thu Aug 18 14:43:31 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.62 2016/07/31 22:36:53 dholland Exp $ */
+/* $NetBSD: decl.c,v 1.63 2016/08/18 14:43:31 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.62 2016/07/31 22:36:53 dholland Exp $");
+__RCSID("$NetBSD: decl.c,v 1.63 2016/08/18 14:43:31 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -1772,23 +1772,27 @@
                        setpackedsize(tp);
                else
                        sp->size = dcs->d_offset;
+
                if (sp->size == 0) {
                        /* zero sized %s */
                        (void)c99ism(47, ttab[t].tt_name);
-               } else {
-                       n = 0;
-                       for (mem = fmem; mem != NULL; mem = mem->s_nxt) {
-                               /* bind anonymous members to the structure */
-                               if (mem->s_styp == NULL)
-                                       mem->s_styp = sp;
-                               if (mem->s_name != unnamed)
-                                       n++;
+               }
+
+               n = 0;
+               for (mem = fmem; mem != NULL; mem = mem->s_nxt) {
+                       /* bind anonymous members to the structure */
+                       if (mem->s_styp == NULL) {
+                               mem->s_styp = sp;
+                               sp->size += tsize(mem->s_type);
                        }
-                       if (n == 0) {
-                               /* %s has no named members */
-                               warning(65,
-                                       t == STRUCT ? "structure" : "union");
-                       }
+                       if (mem->s_name != unnamed)
+                               n++;
+               }
+
+               if (n == 0) {
+                       /* %s has no named members */
+                       warning(65,
+                               t == STRUCT ? "structure" : "union");
                }
        } else {
                tp->t_enum->elem = fmem;