From 8ce6219665fe0ea4679794694eb25d323b3e5c58 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Fri, 20 Oct 2017 16:27:32 +0000 Subject: [PATCH] [multiple changes] 2017-10-20 Bob Duff * sinfo.ads: Fix a comment typo. 2017-10-20 Eric Botcazou * doc/gnat_ugn/building_executable_programs_with_gnat.rst (-flto): Add warning against usage in conjunction with -gnatn. (-fdump-xref): Delete entry. * doc/gnat_ugn/gnat_utility_programs.rst (--ext): Remove mention of -fdump-xref switch. * gnat_ugn.texi: Regenerate. 2017-10-20 Hristian Kirtchev * sem_type.adb, exp_util.adb, sem_util.adb, sem_dim.adb, sem_elab.adb: Minor reformatting. From-SVN: r253947 --- gcc/ada/ChangeLog | 18 ++++++++++++++ ...building_executable_programs_with_gnat.rst | 14 +++-------- .../doc/gnat_ugn/gnat_utility_programs.rst | 6 ++--- gcc/ada/exp_util.adb | 2 +- gcc/ada/gnat_ugn.texi | 24 +++++-------------- gcc/ada/sem_dim.adb | 8 +++---- gcc/ada/sem_elab.adb | 1 + gcc/ada/sem_type.adb | 5 ++-- gcc/ada/sem_util.adb | 2 +- gcc/ada/sinfo.ads | 2 +- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index cb20cfa037c..e9822cbb06d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,21 @@ +2017-10-20 Bob Duff + + * sinfo.ads: Fix a comment typo. + +2017-10-20 Eric Botcazou + + * doc/gnat_ugn/building_executable_programs_with_gnat.rst (-flto): Add + warning against usage in conjunction with -gnatn. + (-fdump-xref): Delete entry. + * doc/gnat_ugn/gnat_utility_programs.rst (--ext): Remove mention of + -fdump-xref switch. + * gnat_ugn.texi: Regenerate. + +2017-10-20 Hristian Kirtchev + + * sem_type.adb, exp_util.adb, sem_util.adb, sem_dim.adb, sem_elab.adb: + Minor reformatting. + 2017-10-20 Yannick Moy * sem_dim.adb (Analyze_Dimension_Binary_Op): Accept with a warning to diff --git a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst index 90d29e1b98d..b6447d05dd6 100644 --- a/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst +++ b/gcc/ada/doc/gnat_ugn/building_executable_programs_with_gnat.rst @@ -1243,21 +1243,13 @@ Alphabetical List of All Switches :file:`scos.adb`. -.. index:: -fdump-xref (gcc) - -:switch:`-fdump-xref` - Generates cross reference information in GLI files for C and C++ sources. - The GLI files have the same syntax as the ALI files for Ada, and can be used - for source navigation in IDEs and on the command line using e.g. gnatxref - and the :switch:`--ext=gli` switch. - - .. index:: -flto (gcc) :switch:`-flto[={n}]` Enables Link Time Optimization. This switch must be used in conjunction - with the traditional :switch:`-Ox` switches and instructs the compiler to - defer most optimizations until the link stage. The advantage of this + with the :switch:`-Ox` switches (but not with the :switch:`-gnatn` switch + since it is a full replacement for the latter) and instructs the compiler + to defer most optimizations until the link stage. The advantage of this approach is that the compiler can do a whole-program analysis and choose the best interprocedural optimization strategy based on a complete view of the program, instead of a fragmentary view with the usual approach. diff --git a/gcc/ada/doc/gnat_ugn/gnat_utility_programs.rst b/gcc/ada/doc/gnat_ugn/gnat_utility_programs.rst index 3f5f2d64c6b..855bb8f3d4d 100644 --- a/gcc/ada/doc/gnat_ugn/gnat_utility_programs.rst +++ b/gcc/ada/doc/gnat_ugn/gnat_utility_programs.rst @@ -586,9 +586,9 @@ The following switches are available for ``gnatxref``: :switch:`--ext={extension}` Specify an alternate ali file extension. The default is ``ali`` and other - extensions (e.g. ``gli`` for C/C++ sources when using :switch:`-fdump-xref`) - may be specified via this switch. Note that if this switch overrides the - default, which means that only the new extension will be considered. + extensions (e.g. ``gli`` for C/C++ sources) may be specified via this switch. + Note that if this switch overrides the default, which means that only the + new extension will be considered. .. index:: --RTS (gnatxref) diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index 16eaf186996..8fdd8aa8200 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -10990,8 +10990,8 @@ package body Exp_Util is Id : Character; Related_Nod : Node_Id := Empty) return Entity_Id is - Temp_Nam : Name_Id; Temp_Id : Entity_Id; + Temp_Nam : Name_Id; begin -- The context requires an external symbol diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index 9488b888941..947506799a5 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -8809,19 +8809,6 @@ in the compiler sources for details in files @code{scos.ads} and @code{scos.adb}. @end table -@geindex -fdump-xref (gcc) - - -@table @asis - -@item @code{-fdump-xref} - -Generates cross reference information in GLI files for C and C++ sources. -The GLI files have the same syntax as the ALI files for Ada, and can be used -for source navigation in IDEs and on the command line using e.g. gnatxref -and the @code{--ext=gli} switch. -@end table - @geindex -flto (gcc) @@ -8830,8 +8817,9 @@ and the @code{--ext=gli} switch. @item @code{-flto[=@emph{n}]} Enables Link Time Optimization. This switch must be used in conjunction -with the traditional @code{-Ox} switches and instructs the compiler to -defer most optimizations until the link stage. The advantage of this +with the @code{-Ox} switches (but not with the @code{-gnatn} switch +since it is a full replacement for the latter) and instructs the compiler +to defer most optimizations until the link stage. The advantage of this approach is that the compiler can do a whole-program analysis and choose the best interprocedural optimization strategy based on a complete view of the program, instead of a fragmentary view with the usual approach. @@ -17949,9 +17937,9 @@ Do not look for library files in the system default directory. @item @code{--ext=@emph{extension}} Specify an alternate ali file extension. The default is @code{ali} and other -extensions (e.g. @code{gli} for C/C++ sources when using @code{-fdump-xref}) -may be specified via this switch. Note that if this switch overrides the -default, which means that only the new extension will be considered. +extensions (e.g. @code{gli} for C/C++ sources) may be specified via this switch. +Note that if this switch overrides the default, which means that only the +new extension will be considered. @end table @geindex --RTS (gnatxref) diff --git a/gcc/ada/sem_dim.adb b/gcc/ada/sem_dim.adb index 19a3cfbbc6c..a271ca55960 100644 --- a/gcc/ada/sem_dim.adb +++ b/gcc/ada/sem_dim.adb @@ -1581,13 +1581,13 @@ package body Sem_Dim is -- literal is treated as if its dimension matches the type -- dimension. - elsif Nkind_In (Original_Node (L), N_Real_Literal, - N_Integer_Literal) + elsif Nkind_In (Original_Node (L), N_Integer_Literal, + N_Real_Literal) then Dim_Warning_For_Numeric_Literal (L, Etype (R)); - elsif Nkind_In (Original_Node (R), N_Real_Literal, - N_Integer_Literal) + elsif Nkind_In (Original_Node (R), N_Integer_Literal, + N_Real_Literal) then Dim_Warning_For_Numeric_Literal (R, Etype (L)); diff --git a/gcc/ada/sem_elab.adb b/gcc/ada/sem_elab.adb index 4802055a076..8dec4280eb3 100644 --- a/gcc/ada/sem_elab.adb +++ b/gcc/ada/sem_elab.adb @@ -8212,6 +8212,7 @@ package body Sem_Elab is -- Reads of variables elsif Is_Suitable_Access (N) then + -- Signal any enclosing local exception handlers that the 'Access may -- raise Program_Error due to a failed ABE check when switch -gnatd.o -- (conservative elaboration order for indirect calls) is in effect. diff --git a/gcc/ada/sem_type.adb b/gcc/ada/sem_type.adb index 812682a846e..e2b3afdf898 100644 --- a/gcc/ada/sem_type.adb +++ b/gcc/ada/sem_type.adb @@ -2838,8 +2838,9 @@ package body Sem_Type is return False; elsif Nkind (Par) in N_Declaration then - return Nkind (Par) = N_Object_Declaration - and then Present (Corresponding_Generic_Association (Par)); + return + Nkind (Par) = N_Object_Declaration + and then Present (Corresponding_Generic_Association (Par)); elsif Nkind (Par) = N_Object_Renaming_Declaration then return Present (Corresponding_Generic_Association (Par)); diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 13f030e7133..47d8f4fe56f 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -12549,7 +12549,7 @@ package body Sem_Util is and then Is_Aliased_View (Renamed_Object (E))))) or else ((Is_Formal (E) or else Is_Formal_Object (E)) - and then Is_Tagged_Type (Etype (E))) + and then Is_Tagged_Type (Etype (E))) or else (Is_Concurrent_Type (E) and then In_Open_Scopes (E)) diff --git a/gcc/ada/sinfo.ads b/gcc/ada/sinfo.ads index c0dfe73a1cd..cf220e4e563 100644 --- a/gcc/ada/sinfo.ads +++ b/gcc/ada/sinfo.ads @@ -770,7 +770,7 @@ package Sinfo is -- The following flag fields appear in all nodes: -- Analyzed - -- This flag is used to indicate that a node (and all its children have + -- This flag is used to indicate that a node (and all its children) have -- been analyzed. It is used to avoid reanalysis of a node that has -- already been analyzed, both for efficiency and functional correctness -- reasons. -- 2.30.2