From patchwork Thu Nov 30 10:19:17 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: 81017 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 BCDFC3875DDD for ; Thu, 30 Nov 2023 10:20:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by sourceware.org (Postfix) with ESMTPS id A8C7B38618A1 for ; Thu, 30 Nov 2023 10:19:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A8C7B38618A1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A8C7B38618A1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::229 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701339562; cv=none; b=rk5vpsWDk1Dxkty4GYTX+itZGUXPT/eC2HDZWcYbbafkbrZZJKncpt9zgVWQJ58QfjpeYzU2lhds9Kpv/u882I4zOcfuXp1+WWQmXcuDNzSLcT7TJ9WBFcN54Yz1X/YxwvWrCMaWQrUZhRFKpjyIALFDGzlBym7aFeQh4gYl+SU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701339562; c=relaxed/simple; bh=RU0MTDuf5EwJ5TJ/+H8jevNgMvaoxIuyUFL0XT22aFc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=g32lOyyVnqNY6JunyVmmeinUu7UlYXdd6dfLqXH3K3yb+SFry5K6oR0nU9bU2kJoNc3YKQTNcObFRsNLW96HKx8Tv+uZEcJoEdgq+Gkx+7pK56AO0febfpklh5rDKK0TP3tP8KGFO72/vZQnwavUVlPyMOWm/6gdKMF98P32cOA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2c9bbb30c34so9582581fa.1 for ; Thu, 30 Nov 2023 02:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1701339559; x=1701944359; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zfWBfBjhBkDggKVHidYosW9qaY6pfGDn/rbe6hkMOa4=; b=YG5BffygVW33dkm7ht4ZqHRM+f+6MP47Lc97AeoOd77de80RI8t8jfH1sq2RrH77Nl tKMYyIqcQskfzuJ6yW+XC5OR0Nz2tyfWlisX4aIMnLGaW9vFGmX/D9123WaqR3ujN2vE HyTCuVPjJI2zq2F+9CCukalXEA41ae+aHwWMUEDgLJvaXzcAgetTxtdaqS5/ZnNiiX++ LX9CEseg3hj0PcBnjsdu1oH027vKB4+E7V08Xg6OO/4+75WblpCUUgNAiIj7LJ/kXr1T 6LXmCM2cR31PKxzLrzGii15IIinnkb+BQzHL/fMlntL7R52Tqj4XXiQx2ygPwLQvrqfv aLqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701339559; x=1701944359; 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=zfWBfBjhBkDggKVHidYosW9qaY6pfGDn/rbe6hkMOa4=; b=FYjfJtU5RjJ8ftkvPA6Q5EIXnf4jgbmcvTyuvUufitQgZgHa3mgJBOqW588ad+t4lL exh+dpBHoyG4yRUO7zyx0AaBAUfxQGXvPHS0VW1e3C6g+mha27ELKSkIQ04b+JCUMCsy ZfU/FGJ4v41sVgMfNS4s7jjOhaIpOeyR/txqIHI9Oisp9hsg0Fm+aTWTTE9yuDxK4TVN b0Nw5B4qbOlWcBp919DNCoSc6fwq7AZArZ8xIigccQwurw2gFfaX43M//1rqOIB6akmu 8GdPx0Zus0Xclg9qt0AyPapjUEo4HmZxFzKW+0EhEYOnDzyr2RKVTRaF1zfN7wypodmP ZWDg== X-Gm-Message-State: AOJu0YxPwW0YRm47LSdMfT9o9FxJdkVO75SG7uBVFAWJbeUK5fI7djx5 OQx5gTtd3GOjT+LJvxxFbvOrnjpAr21oF8HOiDH7kQ== X-Google-Smtp-Source: AGHT+IGdnwO/Xw+SH2tW6DY3hBRAGyr3Ehis/JsKsMJM9oe1zvSXMBtWrgq69nYxwsg+yQWf19Evsg== X-Received: by 2002:a2e:808d:0:b0:2c9:ca9a:b48f with SMTP id i13-20020a2e808d000000b002c9ca9ab48fmr1166388ljg.43.1701339559187; Thu, 30 Nov 2023 02:19:19 -0800 (PST) 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 fa10-20020a05600c518a00b00405442edc69sm5118133wmb.14.2023.11.30.02.19.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 02:19:18 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Steve Baird Subject: [COMMITTED] ada: Support Put_Image for types in user-defined instances of predefined generics. Date: Thu, 30 Nov 2023 11:19:17 +0100 Message-ID: <20231130101918.3094500-1-poulhies@adacore.com> X-Mailer: git-send-email 2.42.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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org From: Steve Baird Predefined units do not generally support the Put_Image attribute. There are good reasons for this in most cases. But if a user-defined instantiation of a predefined generic occurs in Ada 2022 code, then Put_Image can be supported for types declared therein. Add this support. gcc/ada/ * exp_put_image.adb (Put_Image_Enabled): Return True in more cases. In particular, when testing to see if a type occurs in a predefined unit, test the type's code unit (obtained by calling Get_Code_Unit). In the case of type within a user-defined instance of a predefined generic, Is_Predefined_Unit will return True for the type and False for the type's code unit. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_put_image.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/exp_put_image.adb b/gcc/ada/exp_put_image.adb index 6684d4178e6..a30f609cfac 100644 --- a/gcc/ada/exp_put_image.adb +++ b/gcc/ada/exp_put_image.adb @@ -1023,7 +1023,7 @@ package body Exp_Put_Image is null; elsif Is_Derived_Type (Typ) then return Put_Image_Enabled (Etype (Base_Type (Typ))); - elsif In_Predefined_Unit (Typ) then + elsif Is_Predefined_Unit (Get_Code_Unit (Typ)) then return False; end if; end if;