From d449ed7517e34dc3b24c60f2d374a94f46b220d5 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Mon, 25 Sep 2017 09:34:10 +0000 Subject: [PATCH] [multiple changes] 2017-09-25 Piotr Trojanek * adabkend.adb (Call_Back_End): Fix wording of "front-end" and "back-end" in comments. 2017-09-25 Ed Schonberg * exp_ch6.adb (Expand_Call_Helper): The extra accessibility check in a call that appears in a classwide precondition and that mentions an access formal of the subprogram, must use the accessibility level of the actual in the call. This is one case in which a reference to a formal parameter appears outside of the body of the subprogram. From-SVN: r253141 --- gcc/ada/ChangeLog | 13 +++++++++++++ gcc/ada/adabkend.adb | 12 ++++++------ gcc/ada/exp_ch6.adb | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 3780b1db1b2..979748ed75d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,16 @@ +2017-09-25 Piotr Trojanek + + * adabkend.adb (Call_Back_End): Fix wording of "front-end" and + "back-end" in comments. + +2017-09-25 Ed Schonberg + + * exp_ch6.adb (Expand_Call_Helper): The extra accessibility check in a + call that appears in a classwide precondition and that mentions an + access formal of the subprogram, must use the accessibility level of + the actual in the call. This is one case in which a reference to a + formal parameter appears outside of the body of the subprogram. + 2017-09-25 Hristian Kirtchev * sem_res.adb (Replace_Actual_Discriminants): Replace a discriminant diff --git a/gcc/ada/adabkend.adb b/gcc/ada/adabkend.adb index 3c84a483a58..2ab4b19a1d8 100644 --- a/gcc/ada/adabkend.adb +++ b/gcc/ada/adabkend.adb @@ -57,10 +57,10 @@ package body Adabkend is Write_Eol; end if; - -- Frontend leaves the Current_Error_Node at a location that is - -- meaningless and confusing when emitting bugboxes from the backed. By - -- resetting it here we default to "No source file position information - -- available" message on backend crashes. + -- The front end leaves the Current_Error_Node at a location that is + -- meaningless and confusing when emitting bug boxes from the back end. + -- By resetting it here we default to "No source file position + -- information available" message on back end crashes. Current_Error_Node := Empty; @@ -91,7 +91,7 @@ package body Adabkend is -- -- If the switch is not valid, control will not return. The switches -- must still be scanned to skip the "-o" arguments, or internal GCC - -- switches, which may be safely ignored by other back-ends. + -- switches, which may be safely ignored by other back ends. ---------------------------- -- Scan_Back_End_Switches -- @@ -251,7 +251,7 @@ package body Adabkend is else Add_Src_Search_Dir (Argv); - -- Add directory to lib search so that back-end can take as + -- Add directory to lib search so that back end can take as -- input ALI files if needed. Otherwise this won't have any -- impact on the compiler. diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index c2edde696f7..2ee1c7879c6 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -3004,6 +3004,20 @@ package body Exp_Ch6 is then Prev_Orig := Prev; + -- A class-wide precondition generates a test in which formals of + -- the subprogram are replaced by actuals that came from source. + -- In that case as well, the accessiblity comes from the actual. + -- This is the one case in which there are references to formals + -- outside of their subprogram. + + elsif Prev_Orig /= Prev + and then Is_Entity_Name (Prev_Orig) + and then Present (Entity (Prev_Orig)) + and then Is_Formal (Entity (Prev_Orig)) + and then not In_Open_Scopes (Scope (Entity (Prev_Orig))) + then + Prev_Orig := Prev; + -- If the actual is a formal of an enclosing subprogram it is -- the right entity, even if it is a rewriting. This happens -- when the call is within an inherited condition or predicate. -- 2.30.2