From ac846d67c2f93a2f2bb8e697185509196a34e551 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 21 Mar 2021 19:14:40 +0000 Subject: [PATCH] lint: warn about unreachable statement after joining the 'if' branches --- tests/usr.bin/xlint/lint1/msg_193.c | 20 ++++++++++---------- tests/usr.bin/xlint/lint1/msg_193.exp | 9 +++++++++ usr.bin/xlint/lint1/func.c | 12 +++--------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/tests/usr.bin/xlint/lint1/msg_193.c b/tests/usr.bin/xlint/lint1/msg_193.c index d29bee19497c..943566e3b14d 100644 --- a/tests/usr.bin/xlint/lint1/msg_193.c +++ b/tests/usr.bin/xlint/lint1/msg_193.c @@ -1,4 +1,4 @@ -/* $NetBSD: msg_193.c,v 1.7 2021/03/21 15:44:57 rillig Exp $ */ +/* $NetBSD: msg_193.c,v 1.8 2021/03/21 19:14:40 rillig Exp $ */ # 3 "msg_193.c" // Test for message: statement not reached [193] @@ -203,7 +203,7 @@ test_for_if_break(void) break; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } reachable(); } @@ -234,7 +234,7 @@ test_for_if_continue(void) continue; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } unreachable(); /* expect: 193 */ } @@ -265,7 +265,7 @@ test_for_if_return(void) return; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } unreachable(); /* expect: 193 */ } @@ -312,7 +312,7 @@ test_while_if_break(void) break; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } reachable(); } @@ -343,7 +343,7 @@ test_while_if_continue(void) continue; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } unreachable(); /* expect: 193 */ } @@ -374,7 +374,7 @@ test_while_if_return(void) return; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } unreachable(); /* expect: 193 */ } @@ -423,7 +423,7 @@ test_do_while_if_break(void) break; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } while (1); reachable(); } @@ -454,7 +454,7 @@ test_do_while_if_continue(void) continue; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } while (1); unreachable(); /* expect: 193 */ } @@ -485,7 +485,7 @@ test_do_while_if_return(void) return; unreachable(); /* expect: 193 */ } - unreachable(); /* TODO: expect: 193 */ + unreachable(); /* expect: 193 */ } while (1); unreachable(); /* expect: 193 */ } diff --git a/tests/usr.bin/xlint/lint1/msg_193.exp b/tests/usr.bin/xlint/lint1/msg_193.exp index ee25b7f35cfe..b8419f367b34 100644 --- a/tests/usr.bin/xlint/lint1/msg_193.exp +++ b/tests/usr.bin/xlint/lint1/msg_193.exp @@ -19,17 +19,20 @@ msg_193.c(186): warning: statement not reached [193] msg_193.c(197): warning: statement not reached [193] msg_193.c(199): warning: statement not reached [193] msg_193.c(204): warning: statement not reached [193] +msg_193.c(206): warning: statement not reached [193] msg_193.c(217): warning: statement not reached [193] msg_193.c(219): warning: statement not reached [193] msg_193.c(228): warning: statement not reached [193] msg_193.c(230): warning: statement not reached [193] msg_193.c(235): warning: statement not reached [193] +msg_193.c(237): warning: statement not reached [193] msg_193.c(239): warning: statement not reached [193] msg_193.c(248): warning: statement not reached [193] msg_193.c(250): warning: statement not reached [193] msg_193.c(259): warning: statement not reached [193] msg_193.c(261): warning: statement not reached [193] msg_193.c(266): warning: statement not reached [193] +msg_193.c(268): warning: statement not reached [193] msg_193.c(270): warning: statement not reached [193] msg_193.c(278): warning: statement not reached [193] msg_193.c(285): warning: statement not reached [193] @@ -37,32 +40,38 @@ msg_193.c(295): warning: statement not reached [193] msg_193.c(306): warning: statement not reached [193] msg_193.c(308): warning: statement not reached [193] msg_193.c(313): warning: statement not reached [193] +msg_193.c(315): warning: statement not reached [193] msg_193.c(326): warning: statement not reached [193] msg_193.c(328): warning: statement not reached [193] msg_193.c(337): warning: statement not reached [193] msg_193.c(339): warning: statement not reached [193] msg_193.c(344): warning: statement not reached [193] +msg_193.c(346): warning: statement not reached [193] msg_193.c(348): warning: statement not reached [193] msg_193.c(357): warning: statement not reached [193] msg_193.c(359): warning: statement not reached [193] msg_193.c(368): warning: statement not reached [193] msg_193.c(370): warning: statement not reached [193] msg_193.c(375): warning: statement not reached [193] +msg_193.c(377): warning: statement not reached [193] msg_193.c(379): warning: statement not reached [193] msg_193.c(388): warning: statement not reached [193] msg_193.c(406): warning: statement not reached [193] msg_193.c(417): warning: statement not reached [193] msg_193.c(419): warning: statement not reached [193] msg_193.c(424): warning: statement not reached [193] +msg_193.c(426): warning: statement not reached [193] msg_193.c(437): warning: statement not reached [193] msg_193.c(439): warning: statement not reached [193] msg_193.c(448): warning: statement not reached [193] msg_193.c(450): warning: statement not reached [193] msg_193.c(455): warning: statement not reached [193] +msg_193.c(457): warning: statement not reached [193] msg_193.c(459): warning: statement not reached [193] msg_193.c(468): warning: statement not reached [193] msg_193.c(470): warning: statement not reached [193] msg_193.c(479): warning: statement not reached [193] msg_193.c(481): warning: statement not reached [193] msg_193.c(486): warning: statement not reached [193] +msg_193.c(488): warning: statement not reached [193] msg_193.c(490): warning: statement not reached [193] diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c index ca4acf27cd71..da26a431a804 100644 --- a/usr.bin/xlint/lint1/func.c +++ b/usr.bin/xlint/lint1/func.c @@ -1,4 +1,4 @@ -/* $NetBSD: func.c,v 1.94 2021/03/21 19:08:10 rillig Exp $ */ +/* $NetBSD: func.c,v 1.95 2021/03/21 19:14:40 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -37,7 +37,7 @@ #include #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: func.c,v 1.94 2021/03/21 19:08:10 rillig Exp $"); +__RCSID("$NetBSD: func.c,v 1.95 2021/03/21 19:14:40 rillig Exp $"); #endif #include @@ -203,13 +203,7 @@ check_statement_reachable(void) if (!reached && warn_about_unreachable) { /* statement not reached */ warning(193); - /* - * FIXME: Setting 'reached = true' is wrong since the - * statement doesn't magically become reachable just by - * issuing a warning. This must be - * 'warn_about_unreachable = false' instead. - */ - reached = true; /* only to suppress further warnings */ + warn_about_unreachable = false; } }