From patchwork Tue Sep 5 11:08:33 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: 137513 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1610072vqo; Tue, 5 Sep 2023 04:19:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELIBFrIj8KhFl1ZHjQsQt7Gw71Hxr+5kjcc74XEAqh7V/mcrv3YwkwCZ3bgp3xR0tV/irL X-Received: by 2002:a17:907:2bc2:b0:9a1:bebc:8282 with SMTP id gv2-20020a1709072bc200b009a1bebc8282mr8447088ejc.32.1693912749122; Tue, 05 Sep 2023 04:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693912749; cv=none; d=google.com; s=arc-20160816; b=DH5LOf2lF6QwMm7g1a2oFar/7r4EgzaxJA4d2rDAOOvlkJsb9dp9TIw2wwz1xZNpVn LcFAfOsN41a+YegOtrOYRcDlo3vgZNBAHDuESWzc5esWh4jM8PvFRjmGT95QYesefCOI YQ7iMFTUGkKDDFFSe9Her5eu94nSLNpLT8MPKRqw6Br3AdBuJB517HKL+5X3iJBz5ecZ vlnySev0hbb4KQnT8HeFXqTz2Pur1kM4AyB06qbQ/YIXVHTNmqvRXO8l4/ZmZzAVEVDc vurvkZSRvIJG8Tcs/KDLV5zX8XnbDBBKPx1ePIf5pUYnB1MmJif9LH0dAsJtUEFSRclE gcKA== 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=WkUq8ebLfYhPMQR/SNOFFyEFnaKUqWSChEmpaAlBjYk=; fh=QRb7QY4BZ0mIIAPiH2G4K0PcYKRtRn2i5A6VLUA8cN4=; b=xHfhLdYVIWR2KdHWRrjzjSlIGZHRvGqja17qoOZhJhB677ZfyXceSzTm1Yg2fPPfnw fXq6NU32u728pZFPDveQOljGyuXnKusk99LRYLKxdrivgJPaNEyKQI9ji54jTUACBtyN 6a+Ff3wy/IIIdknxQWzBTqbV0oO712TWW53m2Q3SW0JB+rx5e8a2FZ/plDyJEGTtE/RF HHZZC3ZA0+vVxFSQomWlK1wtL5W5rEKJ60Ae/sI4H/UCaY5fXEF3DxxzfLjYKaKY+kWs ZZik1TfS9OwUDClxHU6ZPDSlC3rar6KixCg5ZBHAVPR5cx1haw7Jg6UhBRDkkKLnoNb8 ohIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wiNWJ4Gq; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id qc12-20020a170906d8ac00b00997e8b6eaa7si7573091ejb.510.2023.09.05.04.19.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 04:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wiNWJ4Gq; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 D015E382DC57 for ; Tue, 5 Sep 2023 11:12:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D015E382DC57 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1693912347; bh=WkUq8ebLfYhPMQR/SNOFFyEFnaKUqWSChEmpaAlBjYk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=wiNWJ4GqcLxAAY4UOANLlO6Lnc/qvmDUo6Gv/EvulbyTepZkrsLPL0bVDMRD27QS+ 2JgQ6uAjvrelA61tBC1M/U8IRGsQ8yyleBKjWS4f7Ostm3+qcCnCGUn3F4byF0E+9c K8OPat6LCEbM+wuOEbJyQA4/SdNhddGUAKPmgZDk= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id 695F838555A0 for ; Tue, 5 Sep 2023 11:08:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 695F838555A0 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-402c46c49f4so23655325e9.1 for ; Tue, 05 Sep 2023 04:08:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693912115; x=1694516915; 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=WkUq8ebLfYhPMQR/SNOFFyEFnaKUqWSChEmpaAlBjYk=; b=eexk9K6HSdPc/6MghzplwSsXTML/k1i8mbNmOCzfQl0jabLXs0pNn3R13HeN65wN9V /+TGacsp+6qjguzCd6suutqF6mdZcm01glHZ2K9saAiU1NN2wI/7LPwnprzJ9+Yq16K0 D+CQ03uj71XB1b9TIHfdPW+fkfJdac+6G4boawL3vcqUFSCJaNuh1nAsswGNt5qq0m+w 8XluG6pht0iWPOr+zg6tS7ip7ORzdfWMCMVTTss8uSAKfvU+pqat2sNidfvxXXFG0KhA 3Cd5n9fZEol+/GTDGnXrw5Pe4rgHqiOfTTYQS52qCA9H6zT3ff8vzh7GpFujc/2auemg Wd5Q== X-Gm-Message-State: AOJu0Yx16vm1vnJwjwQpZBt62sGC8tXFHhx/r5L97sgdy3ayk+ceMete GLcUkPUvKeN6GaLECnMg/tsB2MrrGkmQ0GTaBi1NFg== X-Received: by 2002:a7b:c45a:0:b0:401:b0f2:88cb with SMTP id l26-20020a7bc45a000000b00401b0f288cbmr8407870wmi.31.1693912115361; Tue, 05 Sep 2023 04:08:35 -0700 (PDT) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:20fc:79e4:455c:1075]) by smtp.gmail.com with ESMTPSA id r19-20020a05600c299300b003fe539b83f2sm19633183wmd.42.2023.09.05.04.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 04:08:34 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Add guard before querying the type for its interfaces Date: Tue, 5 Sep 2023 13:08:33 +0200 Message-Id: <20230905110833.563425-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: 1776196255024472742 X-GMAIL-MSGID: 1776196255024472742 From: Piotr Trojanek Fix crash on illegal code, when routine Iface_Present_In_Ancestor is called on the predefined String type and attempts to examine the list of interfaces. gcc/ada/ * sem_type.adb (Iface_Present_In_Ancestor): Only look at the list of interfaces for types that allow it. The guard is a high-level equivalent of the entity kinds listed in the preconditon of the Interfaces query. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_type.adb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb index bbdcd5f24b8..8579130cdac 100644 --- a/gcc/ada/sem_type.adb +++ b/gcc/ada/sem_type.adb @@ -2578,7 +2578,9 @@ package body Sem_Type is end if; loop - if Present (Interfaces (E)) then + if Is_Record_Type (E) + and then Present (Interfaces (E)) + then Elmt := First_Elmt (Interfaces (E)); while Present (Elmt) loop AI := Node (Elmt);