diff mbox series

[COMMITTED,22/27] ada: Match assertion levels by name

Message ID	20250915130135.2720894-22-poulhies@adacore.com
State	Committed
Commit	dde7f4252e32b47493a2a6ce45d8d29bede4b2db
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1F88D3857B90 From: =?utf-8?q?Marc_Poulhi=C3=A8s?= <poulhies@adacore.com> To: gcc-patches@gcc.gnu.org Cc: Viljar Indus <indus@adacore.com> Subject: [COMMITTED 22/27] ada: Match assertion levels by name Date: Mon, 15 Sep 2025 15:01:28 +0200 Message-ID: <20250915130135.2720894-22-poulhies@adacore.com> In-Reply-To: <20250915130135.2720894-1-poulhies@adacore.com> References: <20250915130135.2720894-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org
Series	[COMMITTED,01/27] ada: Fix documentation of Is_Ancestor_Package \| [COMMITTED,01/27] ada: Fix documentation of Is_Ancestor_Package [COMMITTED,02/27] ada: Disable ghost context checks before context is set [COMMITTED,03/27] ada: Add `Set_[Wide_]Wide_String` subprograms to auxiliary packages. [COMMITTED,04/27] ada: Fix code generation when there is no No_Finalization restiction [COMMITTED,05/27] ada: Don't generate call of `System.Standard_Library.Adafinal` [COMMITTED,06/27] ada: Recommend GPR's Toolchain_Name for GNAT LLVM more prominently [COMMITTED,07/27] ada: Remove the note that GNAT LLVM doesn't ship the light runtime [COMMITTED,08/27] ada: Improve ghost region creation for pragmas [COMMITTED,09/27] ada: Implement Super aspect and improve implementation of related features. [COMMITTED,10/27] ada: Avoid ghost context check in early freeze [COMMITTED,11/27] ada: Fix section of Finalizable extension in GNAT RM [COMMITTED,12/27] ada: Fix missing finalization for qualified expression in conditional expression [COMMITTED,13/27] ada: Fix crash on iterator of type with Constant_Indexing aspect [COMMITTED,14/27] ada: Add System.C_Time and GNAT.C_Time units to libgnat [COMMITTED,15/27] ada: Fix the condition of ghost level dependencies inside assignments [COMMITTED,16/27] ada: Refactor ghost argument consistency checks [COMMITTED,17/27] ada: Update ghost code SPARK RM rules [COMMITTED,18/27] ada: Remove checks for the old rule 20 [COMMITTED,19/27] ada: Fix ghost condition for level dependencies for assignments [COMMITTED,20/27] ada: Add Assertion_Policy checks for assertion levels [COMMITTED,21/27] ada: C_Pass_By_Copy convention incorrectly ignored [COMMITTED,22/27] ada: Match assertion levels by name [COMMITTED,23/27] ada: Avoid ghost context errors when preanalyzing Loop_Invariant [COMMITTED,24/27] ada: Document hardening features not supported by LLVM [COMMITTED,25/27] ada: Fix wrong finalization of aliased array of bounded vector [COMMITTED,26/27] ada: Remove dependence on secondary stack for type with controlled component [COMMITTED,27/27] ada: Fix internal error on aspect in complex object declaration

Commit Message

Marc Poulhiès Sept. 15, 2025, 1:01 p.m. UTC

  From: Viljar Indus <indus@adacore.com>

Since Assertion_Levels cannot be named after valid assertion names
we no longer need the policies to be matched by entity.

gcc/ada/ChangeLog:

	* sem_prag.adb (Get_Applicable_Policy): Match assertion levels
	by name.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/sem_prag.adb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 172dc3d6f3ec..b1fefa8a2972 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -34217,7 +34217,7 @@  package body Sem_Prag is
            or else P_Nam = Name_Assertion
            or else (P_Nam = Name_Statement_Assertions
                     and then Is_Statement_Assertion (Nam))
-           or else (Present (Level) and then Entity (P_Arg) = Level)
+           or else (Present (Level) and then P_Nam = Chars (Level))
          then
             return Chars (Get_Pragma_Arg (Last (Assocs)));
          end if;