diff options
author | Robert Dewar <dewar@adacore.com> | 2008-08-01 10:35:04 +0200 |
---|---|---|
committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-01 10:35:04 +0200 |
commit | 766d7add511f9edffa341239c0af1c1ec6bdfad2 (patch) | |
tree | d7660e4c4d38071baeb1384270324fdbae8f7086 | |
parent | bd56b3fca70f2a9f277274847268a9b835f2a740 (diff) | |
download | gcc-766d7add511f9edffa341239c0af1c1ec6bdfad2.zip gcc-766d7add511f9edffa341239c0af1c1ec6bdfad2.tar.gz gcc-766d7add511f9edffa341239c0af1c1ec6bdfad2.tar.bz2 |
sem_ch6.adb (Analyze_Subprogram_Body): Remove special casing of Raise_Exception
2008-08-01 Robert Dewar <dewar@adacore.com>
* sem_ch6.adb (Analyze_Subprogram_Body): Remove special casing of
Raise_Exception
From-SVN: r138483
-rw-r--r-- | gcc/ada/sem_ch6.adb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb index 6583b72..498239a 100644 --- a/gcc/ada/sem_ch6.adb +++ b/gcc/ada/sem_ch6.adb @@ -1564,6 +1564,7 @@ package body Sem_Ch6 is -- Subprogram_Specification. In such cases, we undo the change -- made by the analysis of the specification and try to find the -- spec again. + -- Note that wrappers already have their corresponding specs and -- bodies set during their creation, so if the candidate spec is -- a wrapper, then we definately need to swap all types to their @@ -2405,17 +2406,6 @@ package body Sem_Ch6 is and then No_Return (Ent) then Set_Trivial_Subprogram (Stm); - - -- If the procedure name is Raise_Exception, then also - -- assume that it raises an exception. The main target - -- here is Ada.Exceptions.Raise_Exception, but this name - -- is pretty evocative in any context! Note that the - -- procedure in Ada.Exceptions is not marked No_Return - -- because of the annoying case of the null exception Id - -- when operating in Ada 95 mode. - - elsif Chars (Ent) = Name_Raise_Exception then - Set_Trivial_Subprogram (Stm); end if; end; end if; @@ -7756,6 +7746,7 @@ package body Sem_Ch6 is -- procedure. Note that it is only at the outer level that we -- do this fiddling, for the spec cases, the already preanalyzed -- parameters are not affected. + -- For a postcondition pragma within a generic, preserve the pragma -- for later expansion. @@ -7891,7 +7882,7 @@ package body Sem_Ch6 is end loop; end if; - -- If we had any postconditions and expansion is enabled,, build + -- If we had any postconditions and expansion is enabled, build -- the Postconditions procedure. if Present (Plist) |