[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

gcc/ada/ChangeLog

 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

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;

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);