diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-04-08 06:47:27 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-04-08 06:47:27 +0000 |
| commit | aec1fb1161557691f1196f8933974ad19652fd60 (patch) | |
| tree | 80d6e6738d21140c587d6d5aaa1425eb64b67d18 /gcc/ada/a-except.adb | |
| parent | a17c817eae2fff44f185aafb5c8049f99910d48b (diff) | |
| download | gcc-aec1fb1161557691f1196f8933974ad19652fd60.tar.gz | |
2008-04-08 Robert Dewar <dewar@adacore.com>
* a-except-2005.ads, a-except-2005.adb, a-except.ads, a-except.adb
(Raise_Exception): In accordance with AI-446, raise CE for Null_Id
(Raise_Exception_Always): Fix documentation accordingly
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@134018 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/a-except.adb')
| -rw-r--r-- | gcc/ada/a-except.adb | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/gcc/ada/a-except.adb b/gcc/ada/a-except.adb index a07bf294203..7168d48dbfd 100644 --- a/gcc/ada/a-except.adb +++ b/gcc/ada/a-except.adb @@ -377,11 +377,11 @@ package body Ada.Exceptions is -- Run-Time Check Routines -- ----------------------------- - -- These routines are called from the runtime to raise a specific - -- exception with a reason message attached. The parameters are - -- the file name and line number in each case. The names are keyed - -- to the codes defined in Types.ads and a-types.h (for example, - -- the name Rcheck_05 refers to the Reason whose Pos code is 5). + -- These routines raise a specific exception with a reason message + -- attached. The parameters are the file name and line number in each + -- case. The names are keyed to the codes defined in types.ads and + -- a-types.h (for example, the name Rcheck_05 refers to the Reason + -- RT_Exception_Code'Val (5)). procedure Rcheck_00 (File : System.Address; Line : Integer); procedure Rcheck_01 (File : System.Address; Line : Integer); @@ -807,16 +807,20 @@ package body Ada.Exceptions is (E : Exception_Id; Message : String := "") is + EF : Exception_Id := E; + begin - if E /= null then - Exception_Data.Set_Exception_Msg (E, Message); - Abort_Defer.all; - Raise_Current_Excep (E); + -- Raise CE if E = Null_ID (AI-446) + + if E = null then + EF := Constraint_Error'Identity; end if; - -- Note: if E is null then just return (Ada 95 semantics) + -- Go ahead and raise appropriate exception - return; + Exception_Data.Set_Exception_Msg (EF, Message); + Abort_Defer.all; + Raise_Current_Excep (EF); end Raise_Exception; ---------------------------- |