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 0029A3857B98 for ; Thu, 15 Jun 2023 08:04:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0029A3857B98 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 ffacd0b85a97d-31114b46d62so416695f8f.3 for ; Thu, 15 Jun 2023 01:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1686816248; x=1689408248; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TR1WLLtr/5FtjY6mfxWDV9uwHf/462XZIyGD/je6go8=; b=WTazGFn8kFrrXqwS676IH1itQrXDZQQCiIeCukDrWZwCHkUo9+ni7kyY4YY+daLaeR KM2hYJMDwUQzH517fZyC3ySCmpoP/e8FOoI1jbzUdnNZNQSFlmGcijwjGxdx68PwB3L0 GYADVcPzyf4cj8JvNFvgmJ0kRlvCqujyHkZqqP8aSjEe+mLO8KQxNm6MkjC0dJDRRzBo bF54+Cp8mh7THDObh9nYNCzl2J4/LlA50jlgnC/VqXRmfs7+umKdessmJyDk0msEm1PM Eghq3VqQoBzUvgwFeV8vTcNaYvTxtzpOxsN2FTLOpH66oNAr8uunjLw0lGWY1Ou6vsal wKdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686816248; x=1689408248; 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=TR1WLLtr/5FtjY6mfxWDV9uwHf/462XZIyGD/je6go8=; b=KVgdSfUAZeTRlrRL0hiMvyJQGT+CJ9gaLpdhyaQtZ9l34eGHgmCTRFGmTyRtSndwcw 9zjf/J9n0qhlXpqcb9wW41MsCaqUQ7C08TYtWII7aARUrMbxQ0B7WfGTgk/a4pn8OE3i QcQ9XGtX+5H5zhRv4K/GT9mHNP+AaOa+/E2LgLxRtBUFfMl9bdreCrxojtu/+xtyHAJj fwfU2YjYIPgL61+Zt8SdMfWP8p+NezlSnGY7dTil+qEzI+fc2IWc55fUp8CuSM7de534 jjt9poh1+EhsWTCP4U7pYAUGyDxgOvPaWPcqbvcHwYAF5Z+iqPrXM4q2wc6T0aoueqmv Ez4w== X-Gm-Message-State: AC+VfDykY1l5bRM+AAsWDPE4ifb5xI1E0/PzgVZYYRN98z9AJOKu5Fxm YH0G22fEC8GRzhZrWHbUtvaoiqKS1jUFstCOAGx7kA== X-Google-Smtp-Source: ACHHUZ7CLbsKGgkVKgEmXQoPPHLlP/kbp7CrJ/hroSg88ijYKARiyR2p7jmD64jWkICq47x+wkrW6w== X-Received: by 2002:a5d:6991:0:b0:306:2f91:302e with SMTP id g17-20020a5d6991000000b003062f91302emr10767212wru.21.1686816247840; Thu, 15 Jun 2023 01:04:07 -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 e10-20020a056000194a00b0030497b3224bsm20284792wry.64.2023.06.15.01.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 01:04:07 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED] ada: Reject aspect Always_Terminates on functions and generic functions Date: Thu, 15 Jun 2023 10:04:06 +0200 Message-Id: <20230615080406.939322-1-poulhies@adacore.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: From: Piotr Trojanek The recently added aspect Always_Terminates is only allowed on procedures. gcc/ada/ * sem_prag.adb (Analyze_Pragma): Reject pragma Always_Terminates when it applies to a function or generic function. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_prag.adb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 1fa946439ee..0febc445b35 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -13376,6 +13376,19 @@ package body Sem_Prag is Spec_Id := Unique_Defining_Entity (Subp_Decl); + -- Pragma Always_Terminates is not allowed on functions + + if Ekind (Spec_Id) = E_Function then + Error_Msg_N (Fix_Error + ("pragma % cannot apply to function"), N); + return; + + elsif Ekind (Spec_Id) = E_Generic_Function then + Error_Msg_N (Fix_Error + ("pragma % cannot apply to generic function"), N); + return; + end if; + -- A pragma that applies to a Ghost entity becomes Ghost for the -- purposes of legality checks and removal of ignored Ghost code. -- 2.40.0