From a86fbc250c5a6c6d5ae408166ef440f6c0f65df7 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Wed, 20 Jan 2021 17:41:09 +0100 Subject: [PATCH] [Ada] Remove repeated calls in Resolve_Range gcc/ada/ * sem_res.adb (First_Last_Ref): Simplify "if [condition] then return True" in "return [condition]". (Resolve_Range): Remove calls appearing in IF condition from the THEN statements. --- gcc/ada/sem_res.adb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 88d294e..d2819e4 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -10542,12 +10542,9 @@ package body Sem_Res is PL : constant Node_Id := Prefix (Lorig); PH : constant Node_Id := Prefix (Horig); begin - if Is_Entity_Name (PL) + return Is_Entity_Name (PL) and then Is_Entity_Name (PH) - and then Entity (PL) = Entity (PH) - then - return True; - end if; + and then Entity (PL) = Entity (PH); end; end if; @@ -10616,11 +10613,11 @@ package body Sem_Res is if Is_Discrete_Type (Typ) and then Expander_Active then if Is_OK_Static_Expression (L) then - Fold_Uint (L, Expr_Value (L), Is_OK_Static_Expression (L)); + Fold_Uint (L, Expr_Value (L), Static => True); end if; if Is_OK_Static_Expression (H) then - Fold_Uint (H, Expr_Value (H), Is_OK_Static_Expression (H)); + Fold_Uint (H, Expr_Value (H), Static => True); end if; end if; end Resolve_Range; -- 2.7.4