From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 6B288385734E for ; Mon, 26 Sep 2022 09:15:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6B288385734E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wr1-x435.google.com with SMTP id y5so9195229wrh.3 for ; Mon, 26 Sep 2022 02:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=AsHGTuM/lT8VcZYqMYBIg1Pz0VsCq4KGkPYLSZ8tHgw=; b=COnOn638hAe97tNKx73/WDDt9mfWiDA6qdvT3cH4YXRq0p+MwTuAbhXEcltqLTsFRm xQIE+exPAGbVNT3OJpTgYk6phhEnfjaz+oEf2JfLwv9mwlizzL0f5J3gEI210ilWQZd5 IE5UsUrHrkeRj6ox8BY1hzGj3OLtHofFgNC1zgbJZfTKtEGDkhHUI/NzRxjJ+u5CkkGE oeLdUTXwxyJkpPKk9UbUjjkwfz2CuqG6XEQ7p9yEfwM529uYWHy668fjeCH5Nm9Gdk97 6fnvbbETnmVYByTlXLIlA/6yDki91F21PccQw6wyo65yD8k5tawj0gPNt3deFHP+GNXz n5Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=AsHGTuM/lT8VcZYqMYBIg1Pz0VsCq4KGkPYLSZ8tHgw=; b=Tn7xDhRvtGkp6wsTZeNszmNDR1vGHQeaziQtzfxk1WZXWepntc38hSJzimrTobiSsh XhPP7DR0Uza+8f8XPcOZqivK5XAtsy4r3K50H49RJh1o3Su4BOAERRbLRig8kUSQH5uY gf9lN4MP+UOeWqfqjRfHtkokF3N/iE9XFa+7U0enC6XQkdGAD80Kwo6NRBIl9z3TZfYO jsi1LduYL0K0xEK+cCTRYxxF3b4AC1eoNosxOIvWtztH7ZHI90dgwmF4Rj0KENHB2+n6 Rph1LLuttnRrWa49boC1VTX5zcPhkbKHqw27X2bBRQ4o18tb5hn0aCqDZfa2+ZzyLUIV YovA== X-Gm-Message-State: ACrzQf1s4SyRGYFFFzN13ZJGjxalZuNx/PnvLId68bsuwTa01dQ7LsBs TFeWAFsMawQf4uX655HOuONeTpOdxiTj7A== X-Google-Smtp-Source: AMsMyM7XEdOewxlURWYEdRLMxyO9rXEeptZiv0EYyiFBxr1dJwu2Zc6O0NpfAZSW4JPQvnIR57JX8Q== X-Received: by 2002:a5d:500e:0:b0:22a:44ea:dee2 with SMTP id e14-20020a5d500e000000b0022a44eadee2mr12683099wrt.325.1664183715176; Mon, 26 Sep 2022 02:15:15 -0700 (PDT) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id n42-20020a05600c3baa00b003a319b67f64sm26937940wms.0.2022.09.26.02.15.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 02:15:14 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Tucker Taft Subject: [COMMITED] ada: Make Original_Aspect_Pragma_Name more precise Date: Mon, 26 Sep 2022 11:15:11 +0200 Message-Id: <20220926091511.273296-1-poulhies@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Tucker Taft This commit makes Original_Aspect_Pragma_Name more precise in cases where there is a second level of indirection caused by pragmas being turned into Check pragmas. gcc/ada/ * sem_util.adb (Original_Aspect_Pragma_Name): Check for Check pragmas. --- gcc/ada/sem_util.adb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index c43a008ae5d..9ae082ca2e1 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -26559,6 +26559,14 @@ package body Sem_Util is Item_Nam := Chars (Original_Node (Pragma_Identifier (Original_Node (Item)))); + if Item_Nam = Name_Check then + -- Pragma "Check" preserves the original pragma name as its first + -- argument. + Item_Nam := + Chars (Expression (First (Pragma_Argument_Associations + (Original_Node (Item))))); + end if; + else pragma Assert (Nkind (Item) = N_Aspect_Specification); Item_Nam := Chars (Identifier (Item)); -- 2.25.1