 @@ -1,14 +1,14 @@
-/*	$NetBSD: func.c,v 1.151 2023/03/28 20:01:21 rillig Exp $	*/
+/*	$NetBSD: func.c,v 1.152 2023/04/15 10:32:46 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: func.c,v 1.151 2023/03/28 20:01:21 rillig Exp $");
+__RCSID("$NetBSD: func.c,v 1.152 2023/04/15 10:32:46 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 /*
  * Contains a pointer to the symbol table entry of the current function
  * definition.
  */
 sym_t	*funcsym;
 @@ -1037,38 +1037,61 @@ do_continue(void)
 	if (cs == NULL) {
 		/* continue outside loop */
 		error(209);
 	} else {
 		/* TODO: only if reachable, for symmetry with c_break */
 		cs->c_continue = true;
+	}
 	check_statement_reachable();
 	set_reached(false);
+}
 static void
 check_return_value(bool sys, tnode_t *tn)
+{
 	/* Create a temporary node for the left side */
 	tnode_t *ln = expr_zero_alloc(sizeof(*ln));
 	ln->tn_op = NAME;
 	ln->tn_type = expr_unqualified_type(funcsym->s_type->t_subt);
 	ln->tn_lvalue = true;
 	ln->tn_sym = funcsym;	/* better than nothing */
 	tnode_t *retn = build_binary(ln, RETURN, sys, tn);
 	if (retn != NULL) {
 		const tnode_t *rn = retn->tn_right;
 		while (rn->tn_op == CVT || rn->tn_op == PLUS)
 			rn = rn->tn_left;
 		if (rn->tn_op == ADDR && rn->tn_left->tn_op == NAME &&
 		    rn->tn_left->tn_sym->s_scl == AUTO) {
 			/* '%s' returns pointer to automatic object */
 			warning(302, funcsym->s_name);
+		}
+	}
 	expr(retn, true, false, true, false);
+}
 /*
  * T_RETURN T_SEMI
  * T_RETURN expr T_SEMI
  */
 void
 do_return(bool sys, tnode_t *tn)
+{
-	tnode_t	*ln, *rn;
+	control_statement *cs = cstmt;
 	control_statement *cs;
 	op_t	op;
 	cs = cstmt;
 	if (cs == NULL) {
 		/* syntax error '%s' */
 		error(249, "return outside function");
 		return;
+	}
 	for (; cs->c_surrounding != NULL; cs = cs->c_surrounding)
 		continue;
 	if (tn != NULL)
 		cs->c_had_return_value = true;
 	else
 		cs->c_had_return_noval = true;
 @@ -1078,56 +1101,31 @@ do_return(bool sys, tnode_t *tn)
 		error(213, funcsym->s_name);
 		expr_free_all();
 		tn = NULL;
 	} else if (tn == NULL && funcsym->s_type->t_subt->t_tspec != VOID) {
 		/*
 		 * Assume that the function has a return value only if it
 		 * is explicitly declared.
 		 */
 		if (!funcsym->s_return_type_implicit_int)
 			/* function '%s' expects to return value */
 			warning(214, funcsym->s_name);
+	}
-	if (tn != NULL) {
+	if (tn != NULL)
 		check_return_value(sys, tn);
-		/* Create a temporary node for the left side */
+	else
 		ln = expr_zero_alloc(sizeof(*ln));
 		ln->tn_op = NAME;
 		ln->tn_type = expr_unqualified_type(funcsym->s_type->t_subt);
 		ln->tn_lvalue = true;
 		ln->tn_sym = funcsym;		/* better than nothing */
 		tn = build_binary(ln, RETURN, sys, tn);
 		if (tn != NULL) {
 			rn = tn->tn_right;
 			while ((op = rn->tn_op) == CVT || op == PLUS)
 				rn = rn->tn_left;
 			if (rn->tn_op == ADDR && rn->tn_left->tn_op == NAME &&
 			    rn->tn_left->tn_sym->s_scl == AUTO) {
 				/* '%s' returns pointer to automatic object */
 				warning(302, funcsym->s_name);
 		expr(tn, true, false, true, false);
 	} else {
 		check_statement_reachable();
 	set_reached(false);
+}
 /*
  * Do some cleanup after a global declaration or definition.
  * Especially remove information about unused lint comments.
  */
 void
 global_clean_up_decl(bool silent)
+{
 	if (nargusg != -1) {
 		if (!silent) {