(function_cannot_inline_p): Can now inline nested functions.

(expand_inline_function): Set up static chain if needed.
(output_inline_function): Don't switch to temporary allocation here.

From-SVN: r4753
This commit is contained in:
Richard Kenner 1993-06-26 11:18:28 -04:00
parent a34731a692
commit a6dd1cb60d
1 changed files with 19 additions and 9 deletions

View File

@ -103,11 +103,6 @@ function_cannot_inline_p (fndecl)
if (current_function_contains_functions)
return "function with nested functions cannot be inline";
/* This restriction may be eliminated sometime soon. But for now, don't
worry about remapping the static chain. */
if (current_function_needs_context)
return "nested function cannot be inline";
/* If its not even close, don't even look. */
if (!DECL_INLINE (fndecl) && get_max_uid () > 3 * max_insns)
return "function too large to be inline";
@ -1147,6 +1142,7 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
struct inline_remap *map;
rtx cc0_insn = 0;
rtvec arg_vector = ORIGINAL_ARG_VECTOR (header);
rtx static_chain_value = 0;
/* Allow for equivalences of the pseudos we make for virtual fp and ap. */
max_regno = MAX_REGNUM (header) + 3;
@ -1333,6 +1329,10 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_PIC_OFFSET_TABLE)
current_function_uses_pic_offset_table = 1;
/* If this function needs a context, set it up. */
if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT)
static_chain_value = lookup_static_chain (fndecl);
/* Process each argument. For each, set up things so that the function's
reference to the argument will refer to the argument being passed.
We only replace REG with REG here. Any simplifications are done
@ -1587,6 +1587,20 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
else
break;
}
/* If this is setting the static chain pseudo, set it from
the value we want to give it instead. */
else if (static_chain_value != 0
&& GET_CODE (pattern) == SET
&& rtx_equal_p (SET_SRC (pattern),
static_chain_incoming_rtx))
{
rtx newdest = copy_rtx_and_substitute (SET_DEST (pattern), map);
copy = emit_insn (gen_rtx (SET, VOIDmode, newdest,
static_chain_value));
static_chain_value = 0;
}
else
copy = emit_insn (copy_rtx_and_substitute (pattern, map));
/* REG_NOTES will be copied later. */
@ -2812,8 +2826,6 @@ output_inline_function (fndecl)
rtx head = DECL_SAVED_INSNS (fndecl);
rtx last;
temporary_allocation ();
current_function_decl = fndecl;
/* This call is only used to initialize global variables. */
@ -2897,6 +2909,4 @@ output_inline_function (fndecl)
rest_of_compilation (fndecl);
current_function_decl = 0;
permanent_allocation ();
}