The first one is that the propagation does not work if the raise
statement uses a qualified name for the exception, because of an
inconsistency in Expand_N_Raise_Statement.
The second one is that a pragma Assert (False) does not propagate
locally because the rewriting of the degenerate if statement leaves a
dangling reference in a Local_Raise_Statements list.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* exp_ch11.adb (Expand_N_Raise_Statement): Use Is_Entity_Name
consistently in tests on the name of the statement.
* exp_prag.adb (Expand_Pragma_Check): In the local propagation
case, wrap the raise statement in a block statement.diff --git a/gcc/ada/exp_ch11.adb b/gcc/ada/exp_ch11.adb
--- a/gcc/ada/exp_ch11.adb
+++ b/gcc/ada/exp_ch11.adb
@@ -1553,7 +1553,7 @@ package body Exp_Ch11 is
begin
-- Processing for locally handled exception (exclude reraise case)
- if Present (Name (N)) and then Nkind (Name (N)) = N_Identifier then
+ if Present (Name (N)) and then Is_Entity_Name (Name (N)) then
if Debug_Flag_Dot_G
or else Restriction_Active (No_Exception_Propagation)
then
@@ -1657,7 +1657,7 @@ package body Exp_Ch11 is
-- but this is also faster in all modes). Propagate Comes_From_Source
-- flag to the new node.
- if Present (Name (N)) and then Nkind (Name (N)) = N_Identifier then
+ if Present (Name (N)) and then Is_Entity_Name (Name (N)) then
Src := Comes_From_Source (N);
if Entity (Name (N)) = Standard_Constraint_Error then
@@ -1689,7 +1689,7 @@ package body Exp_Ch11 is
-- where location_string identifies the file/line of the raise
- if Present (Name (N)) then
+ if Present (Name (N)) and then Is_Entity_Name (Name (N)) then
declare
Id : Entity_Id := Entity (Name (N));
Buf : Bounded_String;
diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb
--- a/gcc/ada/exp_prag.adb
+++ b/gcc/ada/exp_prag.adb
@@ -425,7 +425,12 @@ package body Exp_Prag is
-- Generate the appropriate if statement. Note that we consider this to
-- be an explicit conditional in the source, not an implicit if, so we
- -- do not call Make_Implicit_If_Statement.
+ -- do not call Make_Implicit_If_Statement. Note also that we wrap the
+ -- raise statement in a block statement so that, if the condition is
+ -- evaluated at compile time to False, then the rewriting of the if
+ -- statement will not involve the raise but the block statement, and
+ -- thus not leave a dangling reference to the raise statement in the
+ -- Local_Raise_Statements list of the handler.
-- Case where we generate a direct raise
@@ -438,8 +443,14 @@ package body Exp_Prag is
Make_If_Statement (Loc,
Condition => Make_Op_Not (Loc, Right_Opnd => Cond),
Then_Statements => New_List (
- Make_Raise_Statement (Loc,
- Name => New_Occurrence_Of (RTE (RE_Assert_Failure), Loc)))));
+ Make_Block_Statement (Loc,
+ Handled_Statement_Sequence =>
+ Make_Handled_Sequence_Of_Statements (Loc,
+ Statements => New_List (
+ Make_Raise_Statement (Loc,
+ Name =>
+ New_Occurrence_Of (RTE (RE_Assert_Failure),
+ Loc))))))));
-- Case where we call the procedure
