From patchwork Tue Sep 5 11:08:26 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: 137505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1607532vqo; Tue, 5 Sep 2023 04:14:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF7MueiWKCAlWUL/He6fgeUJG+A/uFeJp4/wzLgP4XSdvJ8y3OHcIbAvKvmGDxUFLGobngB X-Received: by 2002:a05:6512:10cd:b0:4fb:8ee0:b8a5 with SMTP id k13-20020a05651210cd00b004fb8ee0b8a5mr11592363lfg.46.1693912443704; Tue, 05 Sep 2023 04:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693912443; cv=none; d=google.com; s=arc-20160816; b=eGudRREL9mwBopp4qehE8CedT3bGf8tyyNF2j4J0atpBixpUX+TqebDOP1mHgLoyNi +fV2rPzBcPU30aZgGg4m2BzqBSLnykdWT/ZP+Qym1PPG+LhCYIcYL523d1QYkjeg/MM/ zEMAkrmpEfcqUA/HOpMHzZ88XTJBcT7tRydM3deY2CW07wTmffKoriw3al+Zl++udUcJ z1d/bbyD5vYP69Yb7K7jgSMJIWq+ERfB3buICXSJ8/RNh3g3o1jF+/qYNTpw7w43+oBu sIdNmO+XNGRvspKP9PGJWdWQ9lbH373Hqu+TDMdm9V5a/clFGyO2KaUGyMg4sdZDpI3A ztIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Z0tsBSJaBvCXNMI9k0qzYANZOgZDz98hjifz6r8PVcQ=; fh=SwZJ83OSkcrddnVqQxMJIeT7CBiRDh1+Xn8c83Fto+4=; b=gtpENGTCAdXtqjRsB/jtsgHgLZlwRg7VLDHd285zNlVeVPmrx5NVBOe7u+4xYC/erU XvOk3sNde5maaMwEKQ9Q2RHQk336NL/ODzPt9q7H5SyZgud2vu05dd58N8k+RCxNDHH4 oaLX/EeKVrJI/VygzNEpxVR17b6L7ZxloLrEQ7EMHm3OwGG9K4SrwH69KRp/FPLSSbmL bsbJk9gvQbOPyFJG5I7/Dt+i1nPjuCbQ5Ebjqe0EwQvsEPQiMPkZ2FkVNNppWBaRrTUa jwJmC7/6mPT1k4n+ZJYbotp629Yn3Skt87eLA2i2LmQU9c7GxITB4DzdqGUfNt466F1N eevA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=tWFRAeJe; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id by7-20020a0564021b0700b00529fa63ef70si7720316edb.20.2023.09.05.04.14.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 04:14:03 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=tWFRAeJe; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CA0333893670 for ; Tue, 5 Sep 2023 11:10:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA0333893670 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1693912213; bh=Z0tsBSJaBvCXNMI9k0qzYANZOgZDz98hjifz6r8PVcQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=tWFRAeJe9inoHAnRu/6ZGo37iOg36Oy6Kqsmz1b5Q+vEEL3r/zJSRi+nGcK9nBkQI gBKC1gcXVRtO+d+uvO8QGA1TrHb49jR3n7yUlZe6JNBp/mfamqfebKbAE4oX6CDqni WyXHBjZQBMojWywV5tSuSdaWgdy+lOsTgTi43SUk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 062A03853573 for ; Tue, 5 Sep 2023 11:08:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 062A03853573 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-401da71b85eso23350375e9.1 for ; Tue, 05 Sep 2023 04:08:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693912108; x=1694516908; 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=Z0tsBSJaBvCXNMI9k0qzYANZOgZDz98hjifz6r8PVcQ=; b=g5JrmJFhjwsrnFcD66hGDB3dMcJo2uMqlF44O1uZu3mpD75SgyRyp7lsHngrIGoynf FRIPjrIe4H/Jn2y+Foajx22Oxo5OwW0bzSGNUiU3WFPvISJtLi5YytGf86Dk6mwQU/WH lxEX9xhocEOJahhSt3RrCmxrMQPww5iJP74KxUA2lO/TzQ2RXUOvbdBwXeygn3ag/35c QyHNP/fFLi2BdAUB8hLwEo9KeFLWTz8mLe9qMg3Dx009l27og8pDdGUXNXXSZQiJsME8 9E6zGPCUCTm/sna4No18ouHQVCgmCXjvjQH4jrf9p2o4SoPua14BQt/5U21lORxQkoCZ v3+Q== X-Gm-Message-State: AOJu0YyILPnqp86SlUxx5HpDXSzno79iLN/dT64UV46vX4GC9xKcSJgh MnOc5MBR99Uiy86fDDhwPzNxskkYcFQIH1olftUrrw== X-Received: by 2002:a5d:590c:0:b0:314:3c84:4da2 with SMTP id v12-20020a5d590c000000b003143c844da2mr10370099wrd.13.1693912107931; Tue, 05 Sep 2023 04:08:27 -0700 (PDT) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:20fc:79e4:455c:1075]) by smtp.gmail.com with ESMTPSA id s10-20020adfecca000000b003197869bcd7sm17167755wro.13.2023.09.05.04.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 04:08:27 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Bob Duff Subject: [COMMITTED] ada: Fix crash on selected component lookup in generic instance Date: Tue, 5 Sep 2023 13:08:26 +0200 Message-Id: <20230905110826.563238-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 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.30 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776195934658010026 X-GMAIL-MSGID: 1776195934658010026 From: Bob Duff This patch fixes a compiler crash on selected component lookup in an instance of a generic unit when the relevant type is an itype. gcc/ada/ * sem_ch4.adb (Find_Component_In_Instance): Check that Declaration_Node (Par) is not Empty, as it is for itypes. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_ch4.adb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 8543f0d578b..50ba6c9c847 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -5212,10 +5212,14 @@ package body Sem_Ch4 is end if; end loop; - if Present (Par) and then Is_Generic_Actual_Type (Par) then - - -- Now look for component in ancestor types + -- If Par is a generic actual, look for component in ancestor types. + -- Skip this if we have no Declaration_Node, as is the case for + -- itypes. + if Present (Par) + and then Is_Generic_Actual_Type (Par) + and then Present (Declaration_Node (Par)) + then Par := Generic_Parent_Type (Declaration_Node (Par)); loop Find_Component_In_Instance (Par);