From: charlet Date: Mon, 2 May 2016 09:44:54 +0000 (+0000) Subject: 2016-05-02 Ed Schonberg X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fcc42a9add42572bb198d815b3d04201fc48aabe;p=thirdparty%2Fgcc.git 2016-05-02 Ed Schonberg * sem_util.adb (Normalize_Actuals): Take into account extra actuals that may have been introduced previously. Normally extra actuals are introduced when a call is expanded, but a validity check may copy and reanalyze a call that carries an extra actual (e.g. an accessibility parameter) before the call itself is marked Analzyed, and the analysis of the copy has to be able to cope with the added actual. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235723 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d05918c29b9c..72a1ae50a764 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2016-05-02 Ed Schonberg + + * sem_util.adb (Normalize_Actuals): Take into account extra + actuals that may have been introduced previously. Normally extra + actuals are introduced when a call is expanded, but a validity + check may copy and reanalyze a call that carries an extra actual + (e.g. an accessibility parameter) before the call itself is + marked Analzyed, and the analysis of the copy has to be able to + cope with the added actual. + 2016-05-02 Bob Duff * sem_ch10.adb (Analyze_Compilation_Unit): Preserve diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 863ff308d9a9..4fc783f511dc 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -17088,9 +17088,24 @@ package body Sem_Util is and then Actual /= Last and then No (Next_Named_Actual (Actual)) then - Error_Msg_N ("unmatched actual & in call", - Selector_Name (Actual)); - exit; + -- A validity check may introduce a copy of a call that + -- includes an extra actual (for example for an unrelated + -- accessibility check). Check that the extra actual matches + -- some extra formal, which must exist already because + -- subprogram must be frozen at this point. + + if Present (Extra_Formals (S)) + and then not Comes_From_Source (Actual) + and then Nkind (Actual) = N_Parameter_Association + and then Chars (Extra_Formals (S)) = + Chars (Selector_Name (Actual)) + then + null; + else + Error_Msg_N + ("unmatched actual & in call", Selector_Name (Actual)); + exit; + end if; end if; Next (Actual);