From aa1f8c8b11620fd1a1d65405d79e1aad1ac7a280 Mon Sep 17 00:00:00 2001 From: charlet Date: Thu, 13 Oct 2011 10:40:53 +0000 Subject: [PATCH] 2011-10-13 Sergey Rybin * gnat_ugn.texi: Minor correction. 2011-10-13 Ed Schonberg * sem_ch8.adb: Minor error message improvement. 2011-10-13 Robert Dewar * a-cbprqu.adb, a-ciorma.adb, exp_ch3.adb: Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@179905 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 12 ++++++++++++ gcc/ada/a-cbprqu.adb | 6 +++++- gcc/ada/a-ciorma.adb | 1 - gcc/ada/exp_ch3.adb | 11 +++++------ gcc/ada/gnat_ugn.texi | 2 +- gcc/ada/sem_ch8.adb | 10 +++++++++- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d6c30b3..c095a77 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,15 @@ +2011-10-13 Sergey Rybin + + * gnat_ugn.texi: Minor correction. + +2011-10-13 Ed Schonberg + + * sem_ch8.adb: Minor error message improvement. + +2011-10-13 Robert Dewar + + * a-cbprqu.adb, a-ciorma.adb, exp_ch3.adb: Minor reformatting. + 2011-10-13 Gary Dismukes * exp_ch5.adb (Expand_N_Loop_Statement): For the transformation diff --git a/gcc/ada/a-cbprqu.adb b/gcc/ada/a-cbprqu.adb index e5aff11..cb96167 100644 --- a/gcc/ada/a-cbprqu.adb +++ b/gcc/ada/a-cbprqu.adb @@ -80,8 +80,10 @@ package body Ada.Containers.Bounded_Priority_Queues is begin C := List.Container.First; while Has_Element (C) loop - -- ??? + + -- ??? why is following commented out ??? -- if Before (P, Get_Priority (List.Constant_Reference (C))) then + if Before (P, Get_Priority (Element (C))) then List.Container.Insert (C, New_Item); exit; @@ -109,7 +111,9 @@ package body Ada.Containers.Bounded_Priority_Queues is (List : List_Type) return Queue_Interfaces.Element_Type is begin + -- Use Constant_Reference for this. ??? + return List.Container.First_Element; end First_Element; diff --git a/gcc/ada/a-ciorma.adb b/gcc/ada/a-ciorma.adb index 0947654..3de57c7 100644 --- a/gcc/ada/a-ciorma.adb +++ b/gcc/ada/a-ciorma.adb @@ -1152,7 +1152,6 @@ package body Ada.Containers.Indefinite_Ordered_Maps is return Reference_Type is Node : aliased Element_Type := Element (Container, Key); - begin return (Element => Node'Access); end Reference; diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index 311b5d7..df7c551 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -4207,11 +4207,10 @@ package body Exp_Ch3 is -- anonymous access-to-task pointers. elsif Ada_Version >= Ada_2005 - and then - (Is_Record_Type (Def_Id) - or else - (Is_Array_Type (Def_Id) - and then Is_Record_Type (Component_Type (Def_Id)))) + and then (Is_Record_Type (Def_Id) + or else + (Is_Array_Type (Def_Id) + and then Is_Record_Type (Component_Type (Def_Id)))) then declare Comp : Entity_Id; @@ -4270,7 +4269,7 @@ package body Exp_Ch3 is end if; if Nkind (Type_Definition (Original_Node (N))) = - N_Derived_Type_Definition + N_Derived_Type_Definition and then not Is_Tagged_Type (Def_Id) and then Present (Freeze_Node (Par_Id)) and then Present (TSS_Elist (Freeze_Node (Par_Id))) diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index d7e7a7d..13a4e82 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -17503,7 +17503,7 @@ current directory) @item @samp{@var{gcc_switches}} is a list of switches for @command{gcc}. They will be passed on to all compiler invocations made by -@command{gnatelim} to generate the ASIS trees. Here you can provide +@command{gnatstub} to generate the ASIS trees. Here you can provide @option{^-I^/INCLUDE_DIRS=^} switches to form the source search path, use the @option{-gnatec} switch to set the configuration file, use the @option{-gnat05} switch if sources should be compiled in diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb index 6c561da..21f535c 100644 --- a/gcc/ada/sem_ch8.adb +++ b/gcc/ada/sem_ch8.adb @@ -2398,7 +2398,15 @@ package body Sem_Ch8 is elsif not Is_Entity_Name (Nam) or else not Is_Overloadable (Entity (Nam)) then - Error_Msg_N ("expect valid subprogram name in renaming", N); + -- Do not mention the renaming if it comes from an instance + + if not Is_Actual then + Error_Msg_N ("expect valid subprogram name in renaming", N); + + else + Error_Msg_NE ("no visible subprogram for formal&", N, Nam); + end if; + return; end if; -- 2.7.4