From 7548f2cb238f5d3de28b4f9b587f50204a8b12a0 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Mon, 18 Apr 2016 14:47:02 +0200 Subject: [PATCH] [multiple changes] 2016-04-18 Arnaud Charlet * exp_ch4.adb: Update comment. 2016-04-18 Eric Botcazou * exp_ch6.adb (Expand_Call): Make sure instantiations are registered only once as pending here. From-SVN: r235142 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/exp_ch4.adb | 5 ++--- gcc/ada/exp_ch6.adb | 5 ++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 9a1aeae53e5..b63747205b8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2016-04-18 Arnaud Charlet + + * exp_ch4.adb: Update comment. + +2016-04-18 Eric Botcazou + + * exp_ch6.adb (Expand_Call): Make sure instantiations are + registered only once as pending here. + 2016-04-18 Arnaud Charlet * exp_ch4.adb, gnat1drv.adb, opt.ads, sem_res.adb diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index b08ebfe0f91..08b99a3f783 100644 --- a/gcc/ada/exp_ch4.adb +++ b/gcc/ada/exp_ch4.adb @@ -5290,9 +5290,8 @@ package body Exp_Ch4 is if Present (Actions) then - -- If we want to minimize the use of - -- Expression_With_Actions, just skip the optimization, it - -- is not critical for correctness. + -- To minimize the use of Expression_With_Actions, just skip + -- the optimization as it is not critical for correctness. if Minimize_Expression_With_Actions then return False; diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index 98231722258..b1d4293146c 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -3922,7 +3922,10 @@ package body Exp_Ch6 is Inst := Scope (Inst); end loop; - if Present (Inst) and then Is_Generic_Instance (Inst) then + if Present (Inst) + and then Is_Generic_Instance (Inst) + and then not Is_Inlined (Inst) + then Set_Is_Inlined (Inst); Decl := Unit_Declaration_Node (Inst); -- 2.30.2