utils.c (create_subprog_decl): Use DECL_DECLARED_INLINE_P.

	* gcc-interface/utils.c (create_subprog_decl): Use DECL_DECLARED_INLINE_P.
	(end_subprog_body): Do not set DECL_INLINE.

From-SVN: r140472

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 8513a58f3bfa56f5b49839c27e05c1fdaef8a91b..5d6ecc8032986736795e712b90a532e2bdb9ebd3 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-18  Jan Hubicka  <jh@suse.cz>
+
+       * gcc-interface/utils.c (create_subprog_decl): Use DECL_DECLARED_INLINE_P.
+       (end_subprog_body): Do not set DECL_INLINE.
+
 2008-09-17  Pascal Rigaux  <pixel@mandriva.com>
 
        PR ada/21327

diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index dcf0558ec9db9e3de3eb3f2b817e1c290fbc8452..608f6ecd8652b829dd2e3a8d4004c7a8e4188c2a 100644 (file)
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -1976,7 +1976,7 @@ create_subprog_decl (tree subprog_name, tree asm_name,
   /* If this is a function nested inside an inlined external function, it
      means we aren't going to compile the outer function unless it is
      actually inlined, so do the same for us.  */
-  if (current_function_decl && DECL_INLINE (current_function_decl)
+  if (current_function_decl && DECL_DECLARED_INLINE_P (current_function_decl)
       && DECL_EXTERNAL (current_function_decl))
     extern_flag = true;
 
@@ -2232,10 +2232,6 @@ end_subprog_body (tree body, bool elab_p)
   DECL_INITIAL (fndecl) = current_binding_level->block;
   gnat_poplevel ();
 
-  /* Deal with inline.  If declared inline or we should default to inline,
-     set the flag in the decl.  */
-  DECL_INLINE (fndecl) = 1;
-
   /* We handle pending sizes via the elaboration of types, so we don't
      need to save them.  */
   get_pending_sizes ();