From patchwork Tue May 23 08:07:59 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: 97853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1975049vqo; Tue, 23 May 2023 01:14:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7FlxUixyvV6bXCUipg4uZkSmVjVO/s1XxiBzYEsTNS7xulsD5izaRaXfXDqVApkWlkMMAB X-Received: by 2002:a17:907:9802:b0:971:1717:207b with SMTP id ji2-20020a170907980200b009711717207bmr1423729ejc.35.1684829681459; Tue, 23 May 2023 01:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684829681; cv=none; d=google.com; s=arc-20160816; b=nNwKK1yuWA06K6F22LbQnM8anU0fbIGpzOkAOjstb+ks42z5iKWj5d9TTiUqrQSSNh 3mmnvcnnGHtNcHP8meNw68UWMjFDJwMSDVlsY5AfKVVXPbOOBcAQ4V/JlrpWtjlUGkEe VV4KeNRFVy7cJsptyia6N6n8w6wMPsPWa8eMnOXXY5ejm1nbq1QALso6OOiH8rOAAQnd 4mdnaazvo4hYPaTTYvvmKbbthGqMAULd2rmG+H+Q00ifPee45hZK7NrnVTXYFXrl0j8x QC6LzSvlzdvgkd0TpJDmSIQgbAxROWL6h+YIgSxjccODexAwHbWQJQ+BLYfcL4cTKyfv e+YA== 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=dPyb+1cTtRdAx2maopY6pDegJG228ih6pRoPzzoF8FQ=; b=RkyEODR2X/t0MdS9tBo3BubFGL89VpKQo62NHLlbOa8eM/TUKUoDPvT3YiaoFTUuD1 Sn9+G6rm1yzepiusIycKBHECjNHIjTtl7NyIXML7ds3ZOdtiOyHQJK433p12B8jZaHfP ykpr/UTpi70EvKRU4tKkyPCf9Sqr8Lln86aZnoxcMGkk+QoMohv3iAq230Z9UkZ8gX+L cJ0td66Of7AZVr5Vm/u5F3zvddvyFEmf5SCI4rY1p8VixRrZqPKGBZQLfPaVaLX/2qvI vgn3iPbIaY5rT8f4sHHakO/mbEBlmOti6YD+ZYXF4Lp8yeX2+zId7exrkmCs4toR6Ktu O2bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=pLn0tMhM; 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 sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id v1-20020a1709060b4100b0096f2679212esi5255716ejg.650.2023.05.23.01.14.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:14:41 -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=pLn0tMhM; 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 08B053893653 for ; Tue, 23 May 2023 08:10:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 08B053893653 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684829459; bh=dPyb+1cTtRdAx2maopY6pDegJG228ih6pRoPzzoF8FQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=pLn0tMhMVBQxCOPIvPjj0nb6veWTjlnio1pP1hyylbB9WRetvjArOZe0/GgV9HKsX iWGEJxq3wNY4DXOKHm3ND5sHNoEBQ7kh4AfrSwQ3WMU2id5G7ku/Z64TgZQwlRS19N 3cm6gS4uEAe+veaB998vF95neEgkpP9fFpwHUODM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 1521738555A9 for ; Tue, 23 May 2023 08:08:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1521738555A9 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-309382efe13so4386351f8f.2 for ; Tue, 23 May 2023 01:08:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684829281; x=1687421281; 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=dPyb+1cTtRdAx2maopY6pDegJG228ih6pRoPzzoF8FQ=; b=i2tJFKXZ5VSR0be9fDD7xZVx4pS3bJpeyArIjaZ+FGa6HTNRuIIXoKX/E1CUsMs4CZ 1Fb9yOCaDUs/bDk0B+BK4Hu9TPiMXB/B3PFoiiPz7gFJ3PZUAO9p49u9g7szPbkxLN03 5i7IcFKKxOEl3QlYu/BSb6VJUZNIElrmc1DCtFzqntr0r5ykJodLjsi619PK6k3RBnSM SBebVnUIvszSjGPuJeOy1Nx0fawVAQVIZML9r8YeIXVs2fHdKp513ItXyPyAwJzDrmUY 4CddeONI2mciaw+7GBo6zIFM5K62LDDXao4yyf7yBCrbSBu8WNQmZi9OyPt4hoR/8mX6 URHQ== X-Gm-Message-State: AC+VfDzVjjge3GM0bgrY9kLQZ1xXkRppU+YeJQcPAV7/MegZSR18h56d ldOcFN20HaxmzmOORb3nHO3iEn3hwj5bjHfLdVtXXQ== X-Received: by 2002:a05:6000:1c7:b0:306:34ae:6a23 with SMTP id t7-20020a05600001c700b0030634ae6a23mr10046180wrx.5.1684829281066; Tue, 23 May 2023 01:08:01 -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 f5-20020a5d4dc5000000b002fe13ec49fasm10142471wru.98.2023.05.23.01.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 01:08:00 -0700 (PDT) To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Revert to old pretty-printing of internal entities for CodePeer Date: Tue, 23 May 2023 10:07:59 +0200 Message-Id: <20230523080759.1873226-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766671967849286401?= X-GMAIL-MSGID: =?utf-8?q?1766671967849286401?= From: Piotr Trojanek Add some defensive code to get pretty-printed CodePeer outputs for ACATS back to shape. At least some of this code appears to be redundant and perhaps unnecessary, but we can this up later. Expression pretty-printer should not be called with N_Defining_Identifier nodes at all, since they are not expressions. However, for those that come not from source, CodePeer expects that the Ident_Image routine will convert the internal names like "xL" to their corresponding human-readable representation like "x'Accesibility_Level". gcc/ada/ * pprint.adb (Expression_Image): Restore some of the old pretty-printing for CodePeer. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/pprint.adb | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/gcc/ada/pprint.adb b/gcc/ada/pprint.adb index bcc7a257630..3843ec203b0 100644 --- a/gcc/ada/pprint.adb +++ b/gcc/ada/pprint.adb @@ -731,9 +731,11 @@ package body Pprint is -- itself, but for now simply return the default (if present) or print -- name of the defining identifier. - if Nkind (Expr) not in N_Subexpr then + if Nkind (Expr) = N_Defining_Identifier then pragma Assert (CodePeer_Mode); - if Nkind (Expr) = N_Defining_Identifier then + if Comes_From_Source (Expr) + or else Opt.Debug_Generated_Code + then if Default = "" then declare Nam : constant Name_Id := Chars (Expr); @@ -748,10 +750,24 @@ package body Pprint is return Default; end if; else - raise Program_Error; + declare + S : constant String := + Ident_Image + (Expr => Expr, Orig_Expr => Expr, Expand_Type => True); + begin + if S = "..." then + return Default; + else + return S; + end if; + end; end if; + else + pragma Assert (Nkind (Expr) in N_Subexpr); end if; + -- ??? The following should be primarily needed for CodePeer + if not Comes_From_Source (Expr) or else Opt.Debug_Generated_Code then