From patchwork Tue May 22 13:46:01 2018 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: 918335 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-478171-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="N6dQ6dik"; 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 40qxkn4ZY1z9s7C for ; Tue, 22 May 2018 23:46:25 +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=Asx6KX+QUwyBHx852E35DLqSI1WHU2A0xIPSUiOA2bRckvHyzx TUljcvMFBbUyJ3LXTYb8jX04JuC5txRHDchKFWiCLlWjeZXnhKwXjFlS7JAqobKb CH9baiZUTVJKOY7Mc9xocXadgVkjTlrt/cqE38L5gfKBXL+UfuF/h4umo= 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=dFh34lRLUmDvzlaMVd7vZ6/UA/Q=; b=N6dQ6dikRo9yDBQX0Bn7 uZGUBZlajzhnhv/j/MPSyQSzYGwlGSU0S6hvsBdSdFyhtbUqbwkAslxVTVnyYDep P4gH8RCU2A5+u14mXJwHLGhIsRs1ZcBYaqgPJFJgzlxwhe2c/Pi+Bm26rt7uEzp5 bTrtnVpBQT3maUXhOfJCs98= Received: (qmail 60563 invoked by alias); 22 May 2018 13:46:17 -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 48566 invoked by uid 89); 22 May 2018 13:46:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= 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, 22 May 2018 13:46:03 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id DD190117B04; Tue, 22 May 2018 09:46:01 -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 DFVKa8ktTIQT; Tue, 22 May 2018 09:46:01 -0400 (EDT) Received: from tron.gnat.com (tron.gnat.com [205.232.38.10]) by rock.gnat.com (Postfix) with ESMTP id CC552117AFA; Tue, 22 May 2018 09:46:01 -0400 (EDT) Received: by tron.gnat.com (Postfix, from userid 4862) id C83C24F3; Tue, 22 May 2018 09:46:01 -0400 (EDT) Date: Tue, 22 May 2018 09:46:01 -0400 From: Pierre-Marie de Rodat To: gcc-patches@gcc.gnu.org Cc: Patrick Bernardi Subject: [Ada] Fix compiler abort on invalid discriminant constraint Message-ID: <20180522134601.GA122045@adacore.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes This patch fixes a compiler abort on a discriminant constraint when the constraint is a subtype indication. Tested on x86_64-pc-linux-gnu, committed on trunk 2018-05-22 Patrick Bernardi gcc/ada/ * sem_ch3.adb (Build_Discriminant_Constraints): Raise an error if the user tries to use a subtype indication as a discriminant constraint. gcc/testsuite/ * gnat.dg/discr50.adb: New testcase. --- gcc/ada/sem_ch3.adb +++ gcc/ada/sem_ch3.adb @@ -9877,6 +9877,12 @@ package body Sem_Ch3 is ("a range is not a valid discriminant constraint", Constr); Discr_Expr (D) := Error; + elsif Nkind (Constr) = N_Subtype_Indication then + Error_Msg_N + ("a subtype indication is not a valid discriminant constraint", + Constr); + Discr_Expr (D) := Error; + else Process_Discriminant_Expression (Constr, Discr); Discr_Expr (D) := Constr; --- /dev/null new file mode 100644 +++ gcc/testsuite/gnat.dg/discr50.adb @@ -0,0 +1,11 @@ +-- { dg-do compile } + +procedure Discr50 is + type My_Record (D : Integer) is record + A : Integer; + end record; + + B : My_Record (Positive range 1 .. 10); -- { dg-error "a subtype indication is not a valid discriminant constraint" } +begin + null; +end Discr50;