From 4fb0b3f0ddf99a0a6eae445efc44fbd16600d504 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 9 Sep 2010 15:44:04 +0200 Subject: [PATCH] [multiple changes] 2010-09-09 Ed Schonberg * sem_eval.adb (Is_Same_Value): Two occurrences of the same discriminant cannot be assumed to be the same value because they may refer to bounds of a component of two different instances of a discriminated type. 2010-09-09 Gary Dismukes * checks.adb (Apply_Arithmetic_Overflow_Check): When converting the operands of an operator to the type of an enclosing conversion, rewrite the operator so the conversion can't be flagged as redundant. Remove useless assignments to Typ and Rtyp. 2010-09-09 Eric Botcazou * gnat_ugn.texi: Fix another long line. 2010-09-09 Bob Duff * sem_warn.adb (Output_Reference_Error): Don't warn for renames read but never assigned. From-SVN: r164096 --- gcc/ada/ChangeLog | 23 +++++++++++++++++++++++ gcc/ada/checks.adb | 13 +++++++++---- gcc/ada/gnat_ugn.texi | 3 ++- gcc/ada/sem_eval.adb | 6 ++++++ gcc/ada/sem_warn.adb | 6 ++++-- 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d1ea67277c4..941603e9b3d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,26 @@ +2010-09-09 Ed Schonberg + + * sem_eval.adb (Is_Same_Value): Two occurrences of the same + discriminant cannot be assumed to be the same value because they may + refer to bounds of a component of two different instances of a + discriminated type. + +2010-09-09 Gary Dismukes + + * checks.adb (Apply_Arithmetic_Overflow_Check): When converting the + operands of an operator to the type of an enclosing conversion, rewrite + the operator so the conversion can't be flagged as redundant. + Remove useless assignments to Typ and Rtyp. + +2010-09-09 Eric Botcazou + + * gnat_ugn.texi: Fix another long line. + +2010-09-09 Bob Duff + + * sem_warn.adb (Output_Reference_Error): Don't warn for renames read + but never assigned. + 2010-09-09 Matthew Heaney * a-convec.adb, a-coinve.adb (Clear, Delete, Delete_Last, Finalize, diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb index 59270e875a9..793526ec8a2 100644 --- a/gcc/ada/checks.adb +++ b/gcc/ada/checks.adb @@ -722,8 +722,8 @@ package body Checks is procedure Apply_Arithmetic_Overflow_Check (N : Node_Id) is Loc : constant Source_Ptr := Sloc (N); - Typ : Entity_Id := Etype (N); - Rtyp : Entity_Id := Root_Type (Typ); + Typ : constant Entity_Id := Etype (N); + Rtyp : constant Entity_Id := Root_Type (Typ); begin -- An interesting special case. If the arithmetic operation appears as @@ -815,9 +815,14 @@ package body Checks is Subtype_Mark => New_Occurrence_Of (Target_Type, Loc), Expression => Relocate_Node (Right_Opnd (N)))); + -- Rewrite the conversion operand so that the original + -- node is retained, in order to avoid the warning for + -- redundant conversions in Resolve_Type_Conversion. + + Rewrite (N, Relocate_Node (N)); + Set_Etype (N, Target_Type); - Typ := Target_Type; - Rtyp := Root_Type (Typ); + Analyze_And_Resolve (Left_Opnd (N), Target_Type); Analyze_And_Resolve (Right_Opnd (N), Target_Type); diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 52214829085..6a49f046f5f 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -10109,7 +10109,8 @@ the slowest compilation time. @item ^-O3^/OPTIMIZE=INLINING^ Full optimization as in @option{-O2}; -also uses more aggressive automatic inlining of subprograms within a unit (@pxref{Inlining of Subprograms}) and attemps to vectorize loops. +also uses more aggressive automatic inlining of subprograms within a unit +(@pxref{Inlining of Subprograms}) and attemps to vectorize loops. @item ^-Os^/OPTIMIZE=SPACE^ Optimize space usage (code and data) of resulting program. diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index 467fafadb38..68c9ce8bd49 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -642,9 +642,15 @@ package body Sem_Eval is -- types, since we may have two NaN values and they should never -- compare equal. + -- If the entity is a discriminant, the two expressions may be + -- bounds of components of objects of the same discriminated + -- type. The values of the discriminants are not static, and + -- therefore the result is unknown. + if Nkind_In (Lf, N_Identifier, N_Expanded_Name) and then Nkind_In (Rf, N_Identifier, N_Expanded_Name) and then Entity (Lf) = Entity (Rf) + and then Ekind (Entity (Lf)) /= E_Discriminant and then Present (Entity (Lf)) and then not Is_Floating_Point_Type (Etype (L)) and then not Is_Volatile_Reference (L) diff --git a/gcc/ada/sem_warn.adb b/gcc/ada/sem_warn.adb index fc7e3440b60..953229c5be9 100644 --- a/gcc/ada/sem_warn.adb +++ b/gcc/ada/sem_warn.adb @@ -858,9 +858,11 @@ package body Sem_Warn is procedure Output_Reference_Error (M : String) is begin - -- Never issue messages for internal names + -- Never issue messages for internal names, nor for renamings - if Is_Internal_Name (Chars (E1)) then + if Is_Internal_Name (Chars (E1)) + or else Nkind (Parent (E1)) = N_Object_Renaming_Declaration + then return; end if;