From d2ca577995765e99c5cb21d30ab3baf81398ce39 Mon Sep 17 00:00:00 2001 From: Pierre-Marie de Rodat Date: Thu, 16 Nov 2017 15:56:41 +0000 Subject: [PATCH] [multiple changes] 2017-11-16 Steve Baird * debug.adb: Update another comment to indicate gnat2scil's use of the -gnatd.7 switch. 2017-11-16 Bob Duff * exp_ch6.adb (Expand_Call_Helper): Avoid creating a transient scope in the case of nested build-in-place calls. From-SVN: r254827 --- gcc/ada/ChangeLog | 10 ++++++++++ gcc/ada/debug.adb | 6 ++++++ gcc/ada/exp_ch6.adb | 4 ++++ 3 files changed, 20 insertions(+) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0cc9d30af86..080cd67ea82 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,13 @@ +2017-11-16 Steve Baird + + * debug.adb: Update another comment to indicate gnat2scil's use of the + -gnatd.7 switch. + +2017-11-16 Bob Duff + + * exp_ch6.adb (Expand_Call_Helper): Avoid creating a transient scope in + the case of nested build-in-place calls. + 2017-11-16 Joel Brobecker * doc/gnat_ugn/gnat_utility_programs.rst: Document the switches diff --git a/gcc/ada/debug.adb b/gcc/ada/debug.adb index 75e95912892..06bec39580a 100644 --- a/gcc/ada/debug.adb +++ b/gcc/ada/debug.adb @@ -827,6 +827,12 @@ package body Debug is -- referenced by the generated C code. This debug flag restores the -- output of all the types. + -- d.7 Indicates (to gnat2scil) that CodePeer is being invoked as a + -- prover by the SPARK tools and that therefore gnat2scil should + -- avoid SCIL generation strategies which can introduce soundness + -- issues (e.g., assuming that a low bound of an array parameter + -- of an unconstrained subtype belongs to the index subtype). + -- d.9 Enable build-in-place for function calls returning some nonlimited -- types. diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index 357979e663e..0b36110d13a 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -4354,6 +4354,10 @@ package body Exp_Ch6 is N_Procedure_Call_Statement, N_Selected_Component, N_Slice) + and then + (Ekind (Current_Scope) /= E_Loop + or else Nkind (Parent (N)) /= N_Function_Call + or else not Is_Build_In_Place_Function_Call (Parent (N))) then Establish_Transient_Scope (Call_Node, Sec_Stack => True); end if; -- 2.30.2