 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_135.c,v 1.13 2023/04/22 19:45:04 rillig Exp $	*/
+/*	$NetBSD: msg_135.c,v 1.14 2023/04/22 20:54:28 rillig Exp $	*/
 # 3 "msg_135.c"
 // Test for message: converting '%s' to '%s' increases alignment from %u to %u [135]
 /* lint1-extra-flags: -h -X 351 */
 void sink(const void *);
 unsigned
 read_uint(const unsigned short **pp)
+{
 	unsigned val;
 @@ -85,19 +85,17 @@ plain_char_to_unsigned_type(char *cp)
  * member of the struct determines how the remaining members are interpreted.
  * See sbin/newfs_udf, function udf_validate_tag_and_crc_sums for an example.
  */
 double
 cast_to_union(void)
+{
 	int align_4 = 0;
 	double align_8 = 0.0;
 	union both {
 		int p_align_4;
 		double p_align_8;
 	} *both;
 	/* TODO: don't warn here. */
 	/* expect+1: warning: converting 'pointer to int' to 'pointer to union both' increases alignment from 4 to 8 [135] */
 	both = (union both *)&align_4;
 	both = (union both *)&align_8;
 	return both->p_align_8;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.518 2023/04/22 20:17:19 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.519 2023/04/22 20:54:28 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.518 2023/04/22 20:17:19 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.519 2023/04/22 20:54:28 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 typedef struct integer_constraints {
 @@ -3441,26 +3441,37 @@ struct_starts_with(const type_t *struct_
 	       types_compatible(struct_tp->t_sou->sou_first_member->s_type,
 		   member_tp, true, false, NULL);
+}
 static bool
 is_byte_array(const type_t *tp)
+{
 	return tp->t_tspec == ARRAY &&
 	       (tp->t_subt->t_tspec == CHAR || tp->t_subt->t_tspec == UCHAR);
+}
 static bool
 union_contains(const type_t *utp, const type_t *mtp)
+{
 	for (const sym_t *mem = utp->t_sou->sou_first_member;
 	     mem != NULL; mem = mem->s_next) {
 		if (types_compatible(mem->s_type, mtp, true, false, NULL))
 			return true;
+	}
 	return false;
+}
 static bool
 should_warn_about_pointer_cast(const type_t *nstp, tspec_t nst,
 			       const type_t *ostp, tspec_t ost)
+{
 	while (nst == ARRAY)
 		nstp = nstp->t_subt, nst = nstp->t_tspec;
 	while (ost == ARRAY)
 		ostp = ostp->t_subt, ost = ostp->t_tspec;
 	if (nst == STRUCT && ost == STRUCT &&
 	    (struct_starts_with(nstp, ostp) ||
 	     struct_starts_with(ostp, nstp)))
 		return false;
 @@ -3484,32 +3495,28 @@ should_warn_about_pointer_cast(const typ
 			   true, false, NULL))
 			nmem = nmem->s_next, omem = omem->s_next;
 		if (nmem != NULL && is_byte_array(nmem->s_type))
 			return false;
 		if (omem != NULL && is_byte_array(omem->s_type))
 			return false;
 		if (nmem == NULL && omem == NULL)
 			return false;
+	}
 	if (nst == UNION || ost == UNION) {
 		const type_t *union_tp = nst == UNION ? nstp : ostp;
 		const type_t *other_tp = nst == UNION ? ostp : nstp;
-		for (const sym_t *mem = union_tp->t_sou->sou_first_member;
+		if (union_contains(union_tp, other_tp))
-		     mem != NULL; mem = mem->s_next) {
+			return false;
 			if (types_compatible(mem->s_type, other_tp,
 			    true, false, NULL))
 				return false;
+	}
 	if (is_struct_or_union(nst) && nstp->t_sou != ostp->t_sou)
 		return true;
 	return portable_size_in_bits(nst) != portable_size_in_bits(ost);
+}
 static void
 convert_pointer_from_pointer(type_t *ntp, tnode_t *tn)
+{
 	const type_t *nstp = ntp->t_subt;
 	const type_t *otp = tn->tn_type;
 @@ -3529,27 +3536,28 @@ convert_pointer_from_pointer(type_t *ntp
+		}
 		return;
+	}
 	if (nst == FUNC && ost == FUNC)
 		return;
 	if (nst == FUNC || ost == FUNC) {
 		/* converting '%s' to '%s' is questionable */
 		warning(229, type_name(otp), type_name(ntp));
 		return;
+	}
 	if (hflag && alignment_in_bits(nstp) > alignment_in_bits(ostp) &&
 	    ost != CHAR && ost != UCHAR &&
-	    !is_incomplete(ostp)) {
+	    !is_incomplete(ostp) &&
 	    !(nst == UNION && union_contains(nstp, ostp))) {
 		/* converting '%s' to '%s' increases alignment ... */
 		warning(135, type_name(otp), type_name(ntp),
 		    alignment_in_bits(ostp) / CHAR_SIZE,
 		    alignment_in_bits(nstp) / CHAR_SIZE);
+	}
 	if (cflag && should_warn_about_pointer_cast(nstp, nst, ostp, ost)) {
 		/* pointer cast from '%s' to '%s' may be troublesome */
 		warning(247, type_name(otp), type_name(ntp));
+	}
+}
 /*