diff options
| author | Ed Schonberg <schonberg@adacore.com> | 2009-07-10 11:10:57 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-07-10 11:10:57 +0200 |
| commit | 1ded1a1faeff3ed16dbd320bbb24035a6db21d45 (patch) | |
| tree | 3d5c76540be938aa80aed54e5c70146df915c29e /gcc | |
| parent | c6ad817fc1467991bf8f4109bbc5fd6bf294eabf (diff) | |
| download | gcc-1ded1a1faeff3ed16dbd320bbb24035a6db21d45.zip gcc-1ded1a1faeff3ed16dbd320bbb24035a6db21d45.tar.gz gcc-1ded1a1faeff3ed16dbd320bbb24035a6db21d45.tar.bz2 | |
sem_ch11.adb (analyze_raise_xxx_error): Remove consecutive raise statements with the same condition.
2009-07-10 Ed Schonberg <schonberg@adacore.com>
* sem_ch11.adb (analyze_raise_xxx_error): Remove consecutive raise
statements with the same condition.
From-SVN: r149462
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/sem_ch11.adb | 53 |
1 files changed, 52 insertions, 1 deletions
diff --git a/gcc/ada/sem_ch11.adb b/gcc/ada/sem_ch11.adb index 8aedaf5..73c966c 100644 --- a/gcc/ada/sem_ch11.adb +++ b/gcc/ada/sem_ch11.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2008, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2009, 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- -- @@ -555,6 +555,43 @@ package body Sem_Ch11 is -- field if one is present. procedure Analyze_Raise_xxx_Error (N : Node_Id) is + + function Same_Expression (C1, C2 : Node_Id) return Boolean; + -- It often occurs that two identical raise statements are generated in + -- succession (for example when dynamic elaboration checks take place on + -- separate expressions in a call). If the two statements are identical + -- according to the simple criterion that follows, the raise is + -- converted into a null statement. + + --------------------- + -- Same_Expression -- + --------------------- + + function Same_Expression (C1, C2 : Node_Id) return Boolean is + begin + if No (C1) and then No (C2) then + return True; + + elsif Is_Entity_Name (C1) and then Is_Entity_Name (C2) then + return Entity (C1) = Entity (C2); + + elsif Nkind (C1) /= Nkind (C2) then + return False; + + elsif Nkind (C1) in N_Unary_Op then + return Same_Expression (Right_Opnd (C1), Right_Opnd (C2)); + + elsif Nkind (C1) in N_Binary_Op then + return Same_Expression (Left_Opnd (C1), Left_Opnd (C2)) + and then Same_Expression (Right_Opnd (C1), Right_Opnd (C2)); + + else + return False; + end if; + end Same_Expression; + + -- Start of processing for Analyze_Raise_xxx_Error + begin if No (Etype (N)) then Set_Etype (N, Standard_Void_Type); @@ -574,6 +611,20 @@ package body Sem_Ch11 is Rewrite (N, Make_Null_Statement (Sloc (N))); end if; end if; + + -- Remove duplicate raise statements. Note that the previous one may + -- already have been removed as well. + + if not Comes_From_Source (N) + and then Nkind (N) /= N_Null_Statement + and then Is_List_Member (N) + and then Present (Prev (N)) + and then Nkind (N) = Nkind (Original_Node (Prev (N))) + and then Same_Expression + (Condition (N), Condition (Original_Node (Prev (N)))) + then + Rewrite (N, Make_Null_Statement (Sloc (N))); + end if; end Analyze_Raise_xxx_Error; ----------------------------- |