From patchwork Mon Jan 10 09:41:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1577840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=O8I69AKn; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JXTY52FYfz9s9c for ; Mon, 10 Jan 2022 20:48:41 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CE353891C1D for ; Mon, 10 Jan 2022 09:48:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CE353891C1D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641808119; bh=mVIf05Fp2FJvqJzLEXwi29OIBqp9GScC6mTlXZ+QFVc=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=O8I69AKn+sE1qr9AOdhCvyOIDlohn2w8qkxheYZjQiUXWRl4SCZa8jd+H6JJjvbO5 KLB71zM0mp1UcJYY0mo9E+dOgL4LLS/96rWqT5as44dVNNHyE3YgDZVTgeHh2Gk+GG qrwgUITI99KJw9Emf3bhwE7a26ubzJuS6nOUS2WY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 3C0743891C23 for ; Mon, 10 Jan 2022 09:41:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3C0743891C23 Received: by mail-wm1-x332.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so4798997wme.0 for ; Mon, 10 Jan 2022 01:41:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=mVIf05Fp2FJvqJzLEXwi29OIBqp9GScC6mTlXZ+QFVc=; b=LpM+2dy7/P07zwwR4Rnt3sVV4rcKFuqIus1vY1ezuRsyCVtrmtkmR14KRNqtm+urxE p95pUqYSMsOCxjPCxFj31+hNgo0EH6Va1ivWXQ7wEnfSZtRAwBaVXhIB6AZ2yBDTOeFt NBdH66NmlaaFs3y5kbeW2PqLBINPjHlewqjs/VNWdVoR6BLt/KtYbi7yK7/6kACL1iaA EnsmOkbYXrIZ6renv5i+UwcH5pwFMLEMQ5/H1LgEvYwYLY3R+NFaYbg8EDcwhpGGEu/z YuuzLuiRYQR1Zabc8mJSHOzGaN/PZLt7fAAt+ernkWHwrcdYYmSmqByeupTvMOCPNPmA P5dQ== X-Gm-Message-State: AOAM531dY2xaoN48Dj75seIycLb2irTqPQDjmUyGxThgfoojAHID7u4E 87Z6a6bP/d3XJ20x4K3J5v5aPUM7272a3Q== X-Google-Smtp-Source: ABdhPJxuJhy8ZPNdQkUcH5xU56+L8FIjLc3V/XSxzWbT8nRp5Rfu/3+kxUQoyiRR2On6EJR1RLrlCw== X-Received: by 2002:a05:600c:4013:: with SMTP id i19mr21306855wmm.93.1641807700339; Mon, 10 Jan 2022 01:41:40 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id l4sm4662629wru.74.2022.01.10.01.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:41:39 -0800 (PST) Date: Mon, 10 Jan 2022 09:41:39 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Make pragma Inspection_Point work for constants Message-ID: <20220110094139.GA586162@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.1 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Eric Botcazou Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This entails marking the pragma as requiring an lvalue and explicitly going to the corresponding variable of the constants, which is always built since the front-end marks the constants as having their address taken. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * gcc-interface/trans.c (lvalue_required_p) : New case. : Likewise. (Pragma_to_gnu) : Fetch the corresponding variable of a constant before marking it as addressable. diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -865,6 +865,20 @@ lvalue_required_p (Node_Id gnat_node, tree gnu_type, bool constant, || must_pass_by_ref (gnu_type) || default_pass_by_ref (gnu_type)); + case N_Pragma_Argument_Association: + return lvalue_required_p (gnat_parent, gnu_type, constant, + address_of_constant); + + case N_Pragma: + if (Is_Pragma_Name (Chars (Pragma_Identifier (gnat_parent)))) + { + const unsigned char id + = Get_Pragma_Id (Chars (Pragma_Identifier (gnat_parent))); + return id == Pragma_Inspection_Point; + } + else + return 0; + case N_Indexed_Component: /* Only the array expression can require an lvalue. */ if (Prefix (gnat_parent) != gnat_node) @@ -1387,6 +1401,9 @@ Pragma_to_gnu (Node_Id gnat_node) char *comment; #endif gnu_expr = maybe_unconstrained_array (gnu_expr); + if (TREE_CODE (gnu_expr) == CONST_DECL + && DECL_CONST_CORRESPONDING_VAR (gnu_expr)) + gnu_expr = DECL_CONST_CORRESPONDING_VAR (gnu_expr); gnat_mark_addressable (gnu_expr); #ifdef ASM_COMMENT_START