From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7871) id 59E1D3858C53; Tue, 8 Nov 2022 08:40:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 59E1D3858C53 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667896849; bh=1lnxwwe7wN7Pz5TgftCT6VapsnzAy9vWVF5yoqXK0fs=; h=From:To:Subject:Date:From; b=LEUFgoCIyQxxTraozuiiLk6rl6oPqwcBmViBWRUHBtnNsbAiEdRMQxA+mirV3f6Sn b4PAoMeqOCB7RQkFcpBIhPel9nn6k+IoAf+kzuFpLHPABH7wu/1MU2tl6AZ3x6qZ9K hjLJLI10KUH1rbUo4OVFX8xz0VAaUqMzbYRJAJgs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marc Poulhi?s To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3781] ada: Remove obsolete code in Resolve_If_Expression X-Act-Checkin: gcc X-Git-Author: Eric Botcazou X-Git-Refname: refs/heads/master X-Git-Oldrev: 79e02673e97d1a359ca1fc2dc3f6d51d0debe7d8 X-Git-Newrev: 83ebb97db77ec475668d81ba3e717b2ebbeaffb7 Message-Id: <20221108084049.59E1D3858C53@sourceware.org> Date: Tue, 8 Nov 2022 08:40:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:83ebb97db77ec475668d81ba3e717b2ebbeaffb7 commit r13-3781-g83ebb97db77ec475668d81ba3e717b2ebbeaffb7 Author: Eric Botcazou Date: Wed Oct 19 00:04:31 2022 +0200 ada: Remove obsolete code in Resolve_If_Expression gcc/ada/ * sem_res.adb (Resolve_If_Expression): Remove obsolete special case. Diff: --- gcc/ada/sem_res.adb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 402da430b2f..e5b3612d186 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -9393,21 +9393,10 @@ package body Sem_Res is Apply_Check (Then_Expr); -- If ELSE expression present, just resolve using the determined type - -- If type is universal, resolve to any member of the class. if Present (Else_Expr) then - if Typ = Universal_Integer then - Resolve (Else_Expr, Any_Integer); - - elsif Typ = Universal_Real then - Resolve (Else_Expr, Any_Real); - - else - Resolve (Else_Expr, Result_Type); - end if; - + Resolve (Else_Expr, Result_Type); Check_Unset_Reference (Else_Expr); - Apply_Check (Else_Expr); -- Apply RM 4.5.7 (17/3): whether the expression is statically or