From 87e697202e51033d351f6108eb5fd84f638e4cc1 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Tue, 29 Jul 2014 15:52:53 +0200 Subject: [PATCH] [multiple changes] 2014-07-29 Robert Dewar * sinfo.ads: Minor comment addition. 2014-07-29 Bob Duff * sem_eval.adb, sem_ch13.adb: Minor reformatting. From-SVN: r213190 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/sem_ch13.adb | 6 +++--- gcc/ada/sem_eval.adb | 3 +-- gcc/ada/sinfo.ads | 7 ++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0b5f0c249b99..84d8760c7bc9 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2014-07-29 Robert Dewar + + * sinfo.ads: Minor comment addition. + +2014-07-29 Bob Duff + + * sem_eval.adb, sem_ch13.adb: Minor reformatting. + 2014-07-29 Doug Rupp * init.c: Complete previous change. diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index f1a9f1004d1b..16ce6744d81d 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -7579,7 +7579,7 @@ package body Sem_Ch13 is Object_Name : constant Name_Id := New_Internal_Name ('I'); -- Name for argument of Predicate procedure. Note that we use the same - -- name for both predicate procedure. That way the reference within the + -- name for both predicate functions. That way the reference within the -- predicate expression is the same in both functions. Object_Entity : constant Entity_Id := @@ -10600,7 +10600,7 @@ package body Sem_Ch13 is -- all the cases above. -- One more test that is an implementation artifact caused by the fact - -- that we are analyzing not the original expresesion, but the generated + -- that we are analyzing not the original expression, but the generated -- expression in the body of the predicate function. This can include -- references to inherited predicates, so that the expression we are -- processing looks like: @@ -10609,7 +10609,7 @@ package body Sem_Ch13 is -- Where the call is to a Predicate function for an inherited predicate. -- We simply ignore such a call (which could be to either a dynamic or - -- a static predicate, but remember that we can have Static_Predicate + -- a static predicate, but remember that we can have a Static_Predicate -- for a non-static subtype). elsif Nkind (Expr) = N_Function_Call diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index 44344ceaa5a3..074c2b4000f1 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -363,8 +363,7 @@ package body Sem_Eval is elsif Is_String_Type (Typ) then if Real_Or_String_Static_Predicate_Matches - (Val => Expr_Value_S (Expr), - Typ => Typ) + (Val => Expr_Value_S (Expr), Typ => Typ) then return; end if; diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index 6f5b2a944401..479eb6ec39bc 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -4292,13 +4292,18 @@ package Sinfo is -- (explicitly set to True if missing). -- Note: the Then_Actions and Else_Actions fields are always set to - -- No_List in the tree passed to Gigi. These fields are used only + -- No_List in the tree passed to the back end. These are used only -- for temporary processing purposes in the expander. Even though they -- are semantic fields, their parent pointers are set because analysis -- of actions nodes in those lists may generate additional actions that -- need to know their insertion point (for example for the creation of -- transient scopes). + -- Note: in the tree passed to the back end, if the result type is + -- an unconstrained array, the if expression can only appears in the + -- initializing expression of an object declaration (this avoids the + -- back end having to create a variable length temporary on the fly). + ---------------------------- -- 4.5.7 Case Expression -- ---------------------------- -- 2.47.3