From patchwork Tue Apr 25 10:52:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Charlet X-Patchwork-Id: 754732 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wC0R30c3Jz9s80 for ; Tue, 25 Apr 2017 20:52:30 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="hn3FIOMn"; dkim-atps=neutral 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=a5UonBsfOuWnBGJ3VDi2brArig9g48wZk5Apc5VvXWGm6Om5PM cQsncdiB/SVvzzrRnIe+vQdAX4d9xNVrg3bmTN5KO5prmFvoDBfelD3ZV5HJbQCQ 6OI8KjlrRH9Hf3pVTuMlx8+SKN0dxozLiHt+rdhmuwdRwBiZ1gouNQlP4= 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=BktJApVpiwSzss6nmVSCM+h1OIc=; b=hn3FIOMnSlboIhfqTvJh yuVAai5V+LVYauiYSQ45fTEvsX84NENFV+lCegXcgyYI6gzHrLryJlu45Z+nu2Yg xIUofQN/9nM2HiZed0wfvFA24N+4Zmgxz3ncxmkSI6kec/TNxrmjKfuaixALa0fA 9hCZ3WT6A7jAxfuwoVB05X8= Received: (qmail 45802 invoked by alias); 25 Apr 2017 10:52:21 -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 45792 invoked by uid 89); 25 Apr 2017 10:52:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Protect, protect X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 25 Apr 2017 10:52:20 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 04C5335DB; Tue, 25 Apr 2017 06:52:21 -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 M8ZE7LOV73W5; Tue, 25 Apr 2017 06:52:20 -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 E704635C0; Tue, 25 Apr 2017 06:52:20 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4192) id DFECE3F0; Tue, 25 Apr 2017 06:52:20 -0400 (EDT) Date: Tue, 25 Apr 2017 06:52:20 -0400 From: Arnaud Charlet To: gcc-patches@gcc.gnu.org Cc: Bob Duff Subject: [Ada] Compiler crash on large array aggregate Message-ID: <20170425105220.GA88408@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) This patch fixes a bug in which the compiler crashes if the number of subcomponents in an array aggregate is 2**31 or more. Tested on x86_64-pc-linux-gnu, committed on trunk 2017-04-25 Bob Duff * exp_aggr.adb (Component_Count): Protect the arithmetic from attempting to convert a value >= 2**31 to Int, which would otherwise raise Constraint_Error. Index: exp_aggr.adb =================================================================== --- exp_aggr.adb (revision 247177) +++ exp_aggr.adb (working copy) @@ -352,7 +352,7 @@ -- which hit memory limits in the backend. function Component_Count (T : Entity_Id) return Nat; - -- The limit is applied to the total number of components that the + -- The limit is applied to the total number of subcomponents that the -- aggregate will have, which is the number of static expressions -- that will appear in the flattened array. This requires a recursive -- computation of the number of scalar components of the structure. @@ -399,8 +399,20 @@ return 0; else - return - Siz * UI_To_Int (Expr_Value (Hi) - Expr_Value (Lo) + 1); + -- If the number of components is greater than Int'Last, + -- then return Int'Last, so caller will return False (Aggr + -- size is not OK). Otherwise, UI_To_Int will crash. + + declare + UI : constant Uint := + Expr_Value (Hi) - Expr_Value (Lo) + 1; + begin + if UI_Is_In_Int_Range (UI) then + return Siz * UI_To_Int (UI); + else + return Int'Last; + end if; + end; end if; end;