trans.c (Handled_Sequence_Of_Statements_to_gnu): When not optimizing the CFG...

	* gcc-interface/trans.c (Handled_Sequence_Of_Statements_to_gnu): When
	not optimizing the CFG, clear the DECL_DECLARED_INLINE_P flag on the
	at-end procedures.

From-SVN: r225004

gcc/ada/ChangeLog

 2015-06-26  Eric Botcazou  <ebotcazou@adacore.com>
 
+	* gcc-interface/trans.c (Handled_Sequence_Of_Statements_to_gnu): When
+	not optimizing the CFG, clear the DECL_DECLARED_INLINE_P flag on the
+	at-end procedures.
+
+2015-06-26  Eric Botcazou  <ebotcazou@adacore.com>
+
 	* gcc-interface/gigi.h (note_types_used_by_globals): Delete.
 	(gnat_write_global_declarations): New prototype.
 	* gcc-interface/utils.c (type_decls): Rename back to...

gcc/ada/gcc-interface/trans.c

@@ -4880,8 +4880,14 @@ Handled_Sequence_Of_Statements_to_gnu (Node_Id gnat_node)
      to the binding level we made above.  Note that add_cleanup is FIFO
      so we must register this cleanup after the EH cleanup just above.  */
   if (at_end)
-    add_cleanup (build_call_n_expr (gnat_to_gnu (At_End_Proc (gnat_node)), 0),
-		 gnat_cleanup_loc_node);
+    {
+      tree proc_decl = gnat_to_gnu (At_End_Proc (gnat_node));
+      /* When not optimizing, disable inlining of finalizers as this can
+	 create a more complex CFG in the parent function.  */
+      if (!optimize)
+	DECL_DECLARED_INLINE_P (proc_decl) = 0;
+      add_cleanup (build_call_n_expr (proc_decl, 0), gnat_cleanup_loc_node);
+    }
 
   /* Now build the tree for the declarations and statements inside this block.
      If this is SJLJ, set our jmp_buf as the current buffer.  */