From 4db26d6c4d0f54c15263a5e7a189622e087f6012 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Thu, 18 Sep 2008 22:08:13 +0200 Subject: [PATCH] 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 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/gcc-interface/utils.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 8513a58f3bfa..5d6ecc803298 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2008-09-18 Jan Hubicka + + * 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 PR ada/21327 diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index dcf0558ec9db..608f6ecd8652 100644 --- 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 ();