From patchwork Mon May 29 08:29:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 70217 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 396DF3896C15 for ; Mon, 29 May 2023 08:33:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 396DF3896C15 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685349180; bh=z166ZO081lpyRV8f+TJsCvpw1RXaCL1P7hPIvCvYInQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=hujN0XI80JjfGJZgTa5K6p6eSVLETuIW5Dt0j5mxMZ157/FT+CVMCvUfxiZVqAK5+ U/UjxuoYB3t+4fsCBniYipXoJKVtVWdtBqruXRqFi+LZwiwwIAp2qERe6TjXg860Oh 8e89nyyQvWQx4EbIGvyTBSq7yytyBZJXHWHP+yVY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id A2D54385483B for ; Mon, 29 May 2023 08:29:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A2D54385483B Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3095557dd99so2935246f8f.1 for ; Mon, 29 May 2023 01:29:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685348955; x=1687940955; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=z166ZO081lpyRV8f+TJsCvpw1RXaCL1P7hPIvCvYInQ=; b=V7LFWvOVz9zXLp4Nsdiub1bpwyyWlonGud5XqV8iceCN/cBAgt9J4E9a/YdZ5AOQDn 8ykDHN7kuaeT1Y+tPoJheAOijAay4DXW0ue39pmkVb4eHMXUCB/3JBALo257i359ReCn /TOuTjq3VIqWSp7kBTWcbbDCG838KYkfymmidf/k4M9dGFghpo7DlIyvoJL1qGzk17eN tG5rerfcVUAJLp/WaeQxFP+7ADLRwIwZp2d4tGYMNbvzNyKJord0Qh/dADqREcui33bj TvERuH1vpA8WyIpVX9Or5G/bmLzFVsJGQ/sA+hO/K/zchsfdjtGI0oCNx998NKVwq7tN Ml8w== X-Gm-Message-State: AC+VfDyaZ6uND2T4mGqW9qLBvHb3hv5tR9VLb0e3h0AqxrIrRj0+ohrq 3vm30JJtNBd1pc3yIlHNgw7iv+Ge0VWLZriXTZoZjw== X-Google-Smtp-Source: ACHHUZ5O6/hlnCk+OLOlrc3OMwshhM3MgatN2EhFHUVndgyiYDIwtC2IAZv1gzGaNTaOKbMwYByrNw== X-Received: by 2002:a05:6000:d2:b0:2f9:4fe9:74bb with SMTP id q18-20020a05600000d200b002f94fe974bbmr8600228wrx.40.1685348955610; Mon, 29 May 2023 01:29:15 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id 24-20020a05600c021800b003f080b2f9f4sm16960059wmi.27.2023.05.29.01.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 May 2023 01:29:15 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Javier Miranda Subject: [COMMITTED] ada: Crash on aggregate for tagged record with discriminants Date: Mon, 29 May 2023 10:29:14 +0200 Message-Id: <20230529082914.2409826-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: =?utf-8?q?Marc_Poulhi=C3=A8s_via_Gcc-patches?= From: =?utf-8?q?Marc_Poulhi=C3=A8s?= Reply-To: =?utf-8?q?Marc_Poulhi=C3=A8s?= Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Javier Miranda The frontend may crash processing an aggregate initializing a derived tagged record type that has discriminants. gcc/ada/ * sem_aggr.adb (Resolve_Record_Aggregate): For aggregates of derived tagged record types with discriminants, when collecting components from ancestors, pass to subprogram Gather_Components the parent type. Required to report errors on wrong aggregate components. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_aggr.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index fd0779e66d7..edd495b8359 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -5632,7 +5632,7 @@ package body Sem_Aggr is end if; Record_Def := Type_Definition (Parent (Base_Type (Parent_Typ))); - Gather_Components (Empty, + Gather_Components (Parent_Typ, Component_List (Record_Extension_Part (Record_Def)), Governed_By => New_Assoc_List, Into => Components,