aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2016-04-18 14:47:02 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2016-04-18 14:47:02 +0200
commit7548f2cb238f5d3de28b4f9b587f50204a8b12a0 (patch)
treebd9d1958fe907311a812427cc9bbb7a6ce12eff4 /gcc
parentf916243bde91b7fdca5f6365071d31627e980722 (diff)
downloadgcc-7548f2cb238f5d3de28b4f9b587f50204a8b12a0.zip
gcc-7548f2cb238f5d3de28b4f9b587f50204a8b12a0.tar.gz
gcc-7548f2cb238f5d3de28b4f9b587f50204a8b12a0.tar.bz2
[multiple changes]
2016-04-18 Arnaud Charlet <charlet@adacore.com> * exp_ch4.adb: Update comment. 2016-04-18 Eric Botcazou <ebotcazou@adacore.com> * exp_ch6.adb (Expand_Call): Make sure instantiations are registered only once as pending here. From-SVN: r235142
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog9
-rw-r--r--gcc/ada/exp_ch4.adb5
-rw-r--r--gcc/ada/exp_ch6.adb5
3 files changed, 15 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9a1aeae..b637472 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,14 @@
2016-04-18 Arnaud Charlet <charlet@adacore.com>
+ * exp_ch4.adb: Update comment.
+
+2016-04-18 Eric Botcazou <ebotcazou@adacore.com>
+
+ * exp_ch6.adb (Expand_Call): Make sure instantiations are
+ registered only once as pending here.
+
+2016-04-18 Arnaud Charlet <charlet@adacore.com>
+
* exp_ch4.adb, gnat1drv.adb, opt.ads, sem_res.adb
(Minimize_Expression_With_Actions): New flag.
(Adjust_Global_Switches): Set Minimize_Expression_With_Actions
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index b08ebfe..08b99a3 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 9823172..b1d4293 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);