From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 129503 invoked by alias); 8 Jul 2019 08:19:14 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 128950 invoked by uid 89); 8 Jul 2019 08:19:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=bodies, sem_util, ccg, unaffected X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (209.51.188.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 08 Jul 2019 08:19:09 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkOrX-0002Sc-BC for gcc-patches@gcc.gnu.org; Mon, 08 Jul 2019 04:19:04 -0400 Received: from rock.gnat.com ([205.232.38.15]:40370) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkOrX-0002SK-5U for gcc-patches@gcc.gnu.org; Mon, 08 Jul 2019 04:19:03 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 712CA5618F; Mon, 8 Jul 2019 04:19:00 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id R6XuUpKp7mGT; Mon, 8 Jul 2019 04:19:00 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id 9B1B856190; Mon, 8 Jul 2019 04:18:59 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 9A21C602; Mon, 8 Jul 2019 04:18:59 -0400 (EDT) Date: Mon, 08 Jul 2019 08:19:00 -0000 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Remove dead code from Enclosing_Package_Or_Subprogram routine Message-ID: <20190708081859.GA80776@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="pWyiEgJYm5f9v55/" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 205.232.38.15 X-IsSubscribed: yes X-SW-Source: 2019-07/txt/msg00542.txt.bz2 --pWyiEgJYm5f9v55/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 442 Calls to Scope always return unique entities, i.e. package/subprogram and not their bodies, so there is no need to expect them. Cleanup only; semantics unaffected. (This routine was only used in CCG and GNATprove backends anyway.) Tested on x86_64-pc-linux-gnu, committed on trunk 2019-07-08 Piotr Trojanek gcc/ada/ * sem_util.adb (Enclosing_Package_Or_Subprogram): Do not expect package and subprogram bodies. --pWyiEgJYm5f9v55/ Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="patch.diff" Content-length: 492 --- gcc/ada/sem_util.adb +++ gcc/ada/sem_util.adb @@ -6924,12 +6924,7 @@ package body Sem_Util is S := Scope (E); while Present (S) loop if Is_Package_Or_Generic_Package (S) - or else Ekind (S) = E_Package_Body - then - return S; - - elsif Is_Subprogram_Or_Generic_Subprogram (S) - or else Ekind (S) = E_Subprogram_Body + or else Is_Subprogram_Or_Generic_Subprogram (S) then return S; --pWyiEgJYm5f9v55/--