From patchwork Thu Dec 12 10:04:30 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: 1208341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-515786-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="J2XFM68e"; 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 47YTw829yvz9sPh for ; Thu, 12 Dec 2019 21:06:16 +1100 (AEDT) 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=YIPE6YycDSF+SwO8vc7amg4PUFM1aIseHR5ppwCaND+/B+QMqT Wdi8EF/1X1stwt25pVSG+hQU9f824hH0/FHiOtC1Y/UEgUGKCJSsOeJvcrFIbEIv 0/6epw262GvZ3/SaQeNY8tCcs3FzdMvK6OZgUN1OT4Rr8tdI2LmLHCFX4= 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=0XX6xb/i54SUb737laGiUVlURck=; b=J2XFM68e2IkwBGkmi0P/ r1Zmz4SCykYJTebqZ4KQoUWCpc+RLXaK0T8rTIh5G7tmnFh99PAuRYWi+kR+bgNB 7V02zYJbiGDzBjTIsjjZhCbntSNAXyXwPoan2wcKArl2D9pTRL1pl4G19L0zhNdq dBRC+WhEMf0bZVnLdIX1Mmg= Received: (qmail 37119 invoked by alias); 12 Dec 2019 10:04:37 -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 37002 invoked by uid 89); 12 Dec 2019 10:04:37 -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=HX-detected-operating-system:3.x 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; Thu, 12 Dec 2019 10:04:35 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifLKj-0002td-7v for gcc-patches@gcc.gnu.org; Thu, 12 Dec 2019 05:04:34 -0500 Received: from rock.gnat.com ([205.232.38.15]:49364) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifLKi-0002pU-IT for gcc-patches@gcc.gnu.org; Thu, 12 Dec 2019 05:04:32 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D7CDC5607B; Thu, 12 Dec 2019 05:04:30 -0500 (EST) 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 syOlK1P6sSRx; Thu, 12 Dec 2019 05:04:30 -0500 (EST) 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 C6D7356084; Thu, 12 Dec 2019 05:04:30 -0500 (EST) Received: by tron.gnat.com (Postfix, from userid 4862) id C5BA813B; Thu, 12 Dec 2019 05:04:30 -0500 (EST) Date: Thu, 12 Dec 2019 05:04:30 -0500 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Claire Dross Subject: [Ada] Use correct subtype for call to Last in formal vectors Message-ID: <20191212100430.GA114671@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: 205.232.38.15 X-IsSubscribed: yes Correct the subtype used for a call to Last in Find_Index so that it no longer crashes on empty vectors with checks enabled. Tested on x86_64-pc-linux-gnu, committed on trunk 2019-12-12 Claire Dross gcc/ada/ * libgnat/a-cofove.adb, libgnat/a-cfinve.adb (Find_Index): Use Extended_Index for call to Last. --- gcc/ada/libgnat/a-cfinve.adb +++ gcc/ada/libgnat/a-cfinve.adb @@ -458,7 +458,7 @@ is Index : Index_Type := Index_Type'First) return Extended_Index is K : Count_Type; - Last : constant Index_Type := Last_Index (Container); + Last : constant Extended_Index := Last_Index (Container); begin K := Capacity_Range (Int (Index) - Int (No_Index)); --- gcc/ada/libgnat/a-cofove.adb +++ gcc/ada/libgnat/a-cofove.adb @@ -379,7 +379,7 @@ is Index : Index_Type := Index_Type'First) return Extended_Index is K : Count_Type; - Last : constant Index_Type := Last_Index (Container); + Last : constant Extended_Index := Last_Index (Container); begin K := Capacity_Range (Int (Index) - Int (No_Index));