From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 2EDE83840027; Tue, 15 Jun 2021 10:23:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2EDE83840027 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1478] [Ada] Avoid unhelpful dead code warnings X-Act-Checkin: gcc X-Git-Author: Steve Baird X-Git-Refname: refs/heads/master X-Git-Oldrev: 759df6fd416d0e780ab40f1a6fc6e01130baa727 X-Git-Newrev: ba998f6407ba006a8f8055171ee8e8510f0bc46b Message-Id: <20210615102304.2EDE83840027@sourceware.org> Date: Tue, 15 Jun 2021 10:23:04 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 10:23:04 -0000 https://gcc.gnu.org/g:ba998f6407ba006a8f8055171ee8e8510f0bc46b commit r12-1478-gba998f6407ba006a8f8055171ee8e8510f0bc46b Author: Steve Baird Date: Fri Feb 12 16:34:04 2021 -0800 [Ada] Avoid unhelpful dead code warnings gcc/ada/ * exp_util.adb (Kill_Dead_Code): Generalize the existing handling of if statements to handle case statements similarly. Diff: --- gcc/ada/exp_util.adb | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 78797f64165..860525d12a1 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -9238,28 +9238,33 @@ package body Exp_Util is if W then -- We suppress the warning if this code is under control of an - -- if statement, whose condition is a simple identifier, and - -- either we are in an instance, or warnings off is set for this - -- identifier. The reason for killing it in the instance case is - -- that it is common and reasonable for code to be deleted in - -- instances for various reasons. + -- if/case statement and either + -- a) we are in an instance and the condition/selector + -- has a statically known value; or + -- b) the condition/selector is a simple identifier and + -- warnings off is set for this identifier. + -- Dead code is common and reasonable in instances, so we don't + -- want a warning in that case. - -- Could we use Is_Statically_Unevaluated here??? + declare + C : Node_Id := Empty; + begin + if Nkind (Parent (N)) = N_If_Statement then + C := Condition (Parent (N)); + elsif Nkind (Parent (N)) = N_Case_Statement_Alternative then + C := Expression (Parent (Parent (N))); + end if; - if Nkind (Parent (N)) = N_If_Statement then - declare - C : constant Node_Id := Condition (Parent (N)); - begin - if Nkind (C) = N_Identifier - and then - (In_Instance - or else (Present (Entity (C)) - and then Has_Warnings_Off (Entity (C)))) + if Present (C) then + if (In_Instance and Compile_Time_Known_Value (C)) + or else (Nkind (C) = N_Identifier + and then Present (Entity (C)) + and then Has_Warnings_Off (Entity (C))) then W := False; end if; - end; - end if; + end if; + end; -- Generate warning if not suppressed