* gcc-interface/utils.c (create_subprog_decl): Adjust condition.

From-SVN: r216733

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 64fa248c58a3ae38e3ae1288ca5b759efac84054..f4aba2339054d3d3b94622d5e712bc9fcbb8e674 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-27  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * gcc-interface/utils.c (create_subprog_decl): Adjust condition.
+
 2014-10-27  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc-interface/misc.c (gnat_init_options_struct): Parameterize errno

diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index ef1798e54ce68426ffce491bf97c0fd8dd5fa206..e823a35b1afba22f47b1a56fba9007ac6f6feba5 100644 (file)
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -3021,7 +3021,7 @@ create_subprog_decl (tree subprog_name, tree asm_name, tree subprog_type,
      function in the current unit since it is private to the other unit.
      We could inline the nested function as well but it's probably better
      to err on the side of too little inlining.  */
-  if (inline_status != is_enabled
+  if ((inline_status == is_suppressed || inline_status == is_disabled)
       && !public_flag
       && current_function_decl
       && DECL_DECLARED_INLINE_P (current_function_decl)