[Ada] Assert_Failure vs Assertion_Error

Message ID 20210504095222.GA90458@adacore.com
State New
Headers show
Series
  • [Ada] Assert_Failure vs Assertion_Error
Related show

Commit Message

Pierre-Marie de Rodat May 4, 2021, 9:52 a.m.
When Ada introduced Ada.Assertions.Assertion_Error, we made it a
renaming of the existing System.Assertions.Assert_Failure as provisioned
by the ARM, but we should have done it the other way around, so that the
reference/first class exception is the one from the ARM in e.g.
exception messages.

This is now done by swapping the renaming.

Note that this provides a simple version under gcc-interface for
bootstrap with old GNAT compilers, which are not able to compile
libgnat/a-assert.adb. We will be able to remove this simple version when
we bump by one year the minimal version requirement.

Tested on x86_64-pc-linux-gnu, committed on trunk

gcc/ada/

	* libgnat/s-assert.ads (Assert_Failure): Now a renaming of
	Assertion_Error.
	* libgnat/a-assert.ads (Assertion_Error): Now a first class
	citizen.  Remove dependency on System.Assertions.
	* gcc-interface/a-assert.ads, gcc-interface/a-assert.adb: New.
	* gcc-interface/Make-lang.in (GNAT_ADA_OBJS, GNATBIND_OBJS): Add
	a-assert.o from gcc-interface.

Patch

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -471,6 +471,7 @@  GNAT_ADA_OBJS =	\
  ada/stylesw.o	\
  ada/switch-c.o	\
  ada/switch.o	\
+ ada/gcc-interface/a-assert.o	\
  ada/gcc-interface/system.o	\
  ada/table.o	\
  ada/targparm.o	\
@@ -629,6 +630,7 @@  GNATBIND_OBJS = \
  ada/stylesw.o    \
  ada/switch-b.o   \
  ada/switch.o     \
+ ada/gcc-interface/a-assert.o	\
  ada/gcc-interface/system.o     \
  ada/table.o      \
  ada/targext.o    \


diff --git /dev/null b/gcc/ada/gcc-interface/a-assert.adb
new file mode 100644
--- /dev/null
+++ b/gcc/ada/gcc-interface/a-assert.adb
@@ -0,0 +1,52 @@ 
+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--                           A D A . A S S E R T                            --
+--                                                                          --
+--                                 B o d y                                  --
+--                                                                          --
+--         Copyright (C) 2007-2021, Free Software Foundation, Inc.          --
+--                                                                          --
+-- GNAT is free software;  you can  redistribute it  and/or modify it under --
+-- terms of the  GNU General Public License as published  by the Free Soft- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
+------------------------------------------------------------------------------
+
+package body Ada.Assertions is
+
+   ------------
+   -- Assert --
+   ------------
+
+   procedure Assert (Check : Boolean) is
+   begin
+      if Check = False then
+         raise Ada.Assertions.Assertion_Error;
+      end if;
+   end Assert;
+
+   procedure Assert (Check : Boolean; Message : String) is
+   begin
+      if Check = False then
+         raise Ada.Assertions.Assertion_Error with Message;
+      end if;
+   end Assert;
+
+end Ada.Assertions;


diff --git /dev/null b/gcc/ada/gcc-interface/a-assert.ads
new file mode 100644
--- /dev/null
+++ b/gcc/ada/gcc-interface/a-assert.ads
@@ -0,0 +1,50 @@ 
+------------------------------------------------------------------------------
+--                                                                          --
+--                         GNAT RUN-TIME COMPONENTS                         --
+--                                                                          --
+--                       A D A . A S S E R T I O N S                        --
+--                                                                          --
+--            Copyright (C) 2015-2021, Free Software Foundation, Inc.       --
+--                                                                          --
+--                                 S p e c                                  --
+--                                                                          --
+-- This specification is derived from the Ada Reference Manual for use with --
+-- GNAT. The copyright notice above, and the license provisions that follow --
+-- apply solely to the contracts that have been added.                      --
+--                                                                          --
+-- GNAT is free software;  you can  redistribute it  and/or modify it under --
+-- terms of the  GNU General Public License as published  by the Free Soft- --
+-- ware  Foundation;  either version 3,  or (at your option) any later ver- --
+-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
+-- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
+-- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/>.                                          --
+--                                                                          --
+-- GNAT was originally developed  by the GNAT team at  New York University. --
+-- Extensive contributions were provided by Ada Core Technologies Inc. --
+--                                                                          --
+------------------------------------------------------------------------------
+
+--  This version is used to bootstrap the compiler only.
+--  It can be removed when we switch to using a GNAT from 2014 or later.
+
+pragma Compiler_Unit_Warning;
+
+package Ada.Assertions is
+   pragma Pure;
+
+   Assertion_Error : exception;
+
+   procedure Assert (Check : Boolean);
+
+   procedure Assert (Check : Boolean; Message : String);
+
+end Ada.Assertions;


diff --git a/gcc/ada/libgnat/a-assert.ads b/gcc/ada/libgnat/a-assert.ads
--- a/gcc/ada/libgnat/a-assert.ads
+++ b/gcc/ada/libgnat/a-assert.ads
@@ -39,23 +39,12 @@ 
 
 pragma Assertion_Policy (Pre => Ignore);
 
---  We do a with of System.Assertions to get hold of the exception (following
---  the specific RM permission that lets' Assertion_Error being a renaming).
---  The suppression of Warnings stops the warning about bad categorization.
-
-pragma Warnings (Off);
-with System.Assertions;
-pragma Warnings (On);
+pragma Compiler_Unit_Warning;
 
 package Ada.Assertions with
-  SPARK_Mode
+  SPARK_Mode, Pure
 is
-   pragma Pure (Assertions);
-
-   Assertion_Error : exception renames System.Assertions.Assert_Failure;
-   --  This is the renaming that is allowed by 11.4.2(24). Note that the
-   --  Exception_Name will refer to the one in System.Assertions (see
-   --  AARM-11.4.1(12.b)).
+   Assertion_Error : exception;
 
    procedure Assert (Check : Boolean) with
      Pre => Check;


diff --git a/gcc/ada/libgnat/s-assert.ads b/gcc/ada/libgnat/s-assert.ads
--- a/gcc/ada/libgnat/s-assert.ads
+++ b/gcc/ada/libgnat/s-assert.ads
@@ -38,9 +38,11 @@ 
 
 pragma Compiler_Unit_Warning;
 
+with Ada.Assertions;
+
 package System.Assertions is
 
-   Assert_Failure : exception;
+   Assert_Failure : exception renames Ada.Assertions.Assertion_Error;
    --  Exception raised when assertion fails
 
    procedure Raise_Assert_Failure (Msg : String);