From patchwork Wed Sep 18 08:39:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1163842 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-509181-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="k8d84aWQ"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46YD5b1S2bz9sCJ for ; Wed, 18 Sep 2019 18:43:14 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=vt5hK4FKT/TjJpx3KPpWjNgBACd+V87yMi73t4K1afo9VSLs+i kwmP5og0SrwbFScpGfTpJ4nczsAzuHkZKFP9KSu0HD7//5daIuGN1URyJ4Voqv7e EE0KTeJu71EvYgXV1bHCqOJneH801KTjc59Gyms3xSRcXHZcFK48ynt/A= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=9UBiE8ulhiq7tYSOTB7jhz1Zy/U=; b=k8d84aWQtsHE7HpjmGG4 Z4gDhmMC5p9Gnqd6BEZxuwzzYjmntgMX0wFpWzWP8w54oxyuWQlyhkjZ2NSKwO5c gv3nZVlojwpDYYPUwebjcrhAwDN0DA6BXJ8Vql0pvyxm95Xsj0v/YBgpdYYJR2QJ fMyjjMpcpOMaKDRjXmtNGN8= Received: (qmail 103350 invoked by alias); 18 Sep 2019 08:40:09 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 101698 invoked by uid 89); 18 Sep 2019 08:39:57 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.1 spammy=exp_dbugads, UD:exp_dbug.ads, Exp_Dbug, exp_dbug.ads 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; Wed, 18 Sep 2019 08:39:55 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAVVB-0008HS-0S for gcc-patches@gcc.gnu.org; Wed, 18 Sep 2019 04:39:54 -0400 Received: from rock.gnat.com ([2620:20:4000:0:a9e:1ff:fe9b:1d1]:53786) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAVV9-0008ET-V2 for gcc-patches@gcc.gnu.org; Wed, 18 Sep 2019 04:39:52 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 2CD10117CD0; Wed, 18 Sep 2019 04:39:45 -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 tjpjuvZTnMks; Wed, 18 Sep 2019 04:39:45 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) by rock.gnat.com (Postfix) with ESMTP id 08870117CDC; Wed, 18 Sep 2019 04:39:45 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id 07581702; Wed, 18 Sep 2019 04:39:45 -0400 (EDT) Date: Wed, 18 Sep 2019 04:39:45 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [Ada] Refine type of Get_Homonym_Number result Message-ID: <20190918083945.GA145128@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 2620:20:4000:0:a9e:1ff:fe9b:1d1 X-IsSubscribed: yes Routine Get_Homonym_Number always returns a positive number. This is explained in its comment and is evident from its body. No test attached, because semantics is unaffected. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-09-18 Piotr Trojanek gcc/ada/ * exp_dbug.ads, exp_dbug.adb (Get_Homonym_Number): Refine type from Nat to Pos. * sem_util.adb (Add_Homonym_Suffix): Refine type of a local variable. --- gcc/ada/exp_dbug.adb +++ gcc/ada/exp_dbug.adb @@ -1058,9 +1058,9 @@ package body Exp_Dbug is -- Get_Homonym_Number -- ------------------------ - function Get_Homonym_Number (E : Entity_Id) return Nat is + function Get_Homonym_Number (E : Entity_Id) return Pos is H : Entity_Id := Homonym (E); - Nr : Nat := 1; + Nr : Pos := 1; begin while Present (H) loop --- gcc/ada/exp_dbug.ads +++ gcc/ada/exp_dbug.ads @@ -460,7 +460,7 @@ package Exp_Dbug is -- Subprograms for Handling Qualification -- -------------------------------------------- - function Get_Homonym_Number (E : Entity_Id) return Nat; + function Get_Homonym_Number (E : Entity_Id) return Pos; -- Return the homonym number for E, which is its position in the homonym -- chain starting at 1. This is exported for use in GNATprove. --- gcc/ada/sem_util.adb +++ gcc/ada/sem_util.adb @@ -26183,7 +26183,7 @@ package body Sem_Util is if Has_Homonym (U) then declare - N : constant Nat := Get_Homonym_Number (U); + N : constant Pos := Get_Homonym_Number (U); S : constant String := N'Img; begin if N > 1 then