Commit 216d5cdd by Richard Stallman

*** empty log message ***

From-SVN: r1566
parent 44fe2e80
...@@ -526,7 +526,7 @@ expand_call (exp, target, ignore) ...@@ -526,7 +526,7 @@ expand_call (exp, target, ignore)
Use abstraction instead of setting TREE_ADDRESSABLE Use abstraction instead of setting TREE_ADDRESSABLE
directly. */ directly. */
if (TREE_INLINE (fndecl) && extra_warnings && !flag_no_inline) if (DECL_INLINE (fndecl) && extra_warnings && !flag_no_inline)
warning_with_decl (fndecl, "can't inline call to `%s' which was declared inline"); warning_with_decl (fndecl, "can't inline call to `%s' which was declared inline");
mark_addressable (fndecl); mark_addressable (fndecl);
} }
......
...@@ -113,14 +113,14 @@ function_cannot_inline_p (fndecl) ...@@ -113,14 +113,14 @@ function_cannot_inline_p (fndecl)
return "nested function cannot be inline"; return "nested function cannot be inline";
/* If its not even close, don't even look. */ /* If its not even close, don't even look. */
if (!TREE_INLINE (fndecl) && get_max_uid () > 3 * max_insns) if (!DECL_INLINE (fndecl) && get_max_uid () > 3 * max_insns)
return "function too large to be inline"; return "function too large to be inline";
#if 0 #if 0
/* Large stacks are OK now that inlined functions can share them. */ /* Large stacks are OK now that inlined functions can share them. */
/* Don't inline functions with large stack usage, /* Don't inline functions with large stack usage,
since they can make other recursive functions burn up stack. */ since they can make other recursive functions burn up stack. */
if (!TREE_INLINE (fndecl) && get_frame_size () > 100) if (!DECL_INLINE (fndecl) && get_frame_size () > 100)
return "function stack frame for inlining"; return "function stack frame for inlining";
#endif #endif
...@@ -150,7 +150,7 @@ function_cannot_inline_p (fndecl) ...@@ -150,7 +150,7 @@ function_cannot_inline_p (fndecl)
if (int_size_in_bytes (TREE_TYPE (parms)) < 0) if (int_size_in_bytes (TREE_TYPE (parms)) < 0)
return "function with varying-size parameter cannot be inline"; return "function with varying-size parameter cannot be inline";
if (!TREE_INLINE (fndecl) && get_max_uid () > max_insns) if (!DECL_INLINE (fndecl) && get_max_uid () > max_insns)
{ {
for (ninsns = 0, insn = get_first_nonparm_insn (); insn && ninsns < max_insns; for (ninsns = 0, insn = get_first_nonparm_insn (); insn && ninsns < max_insns;
insn = NEXT_INSN (insn)) insn = NEXT_INSN (insn))
...@@ -328,7 +328,7 @@ finish_inline (fndecl, head) ...@@ -328,7 +328,7 @@ finish_inline (fndecl, head)
FIRST_PARM_INSN (head) = get_insns (); FIRST_PARM_INSN (head) = get_insns ();
DECL_SAVED_INSNS (fndecl) = head; DECL_SAVED_INSNS (fndecl) = head;
DECL_FRAME_SIZE (fndecl) = get_frame_size (); DECL_FRAME_SIZE (fndecl) = get_frame_size ();
TREE_INLINE (fndecl) = 1; DECL_INLINE (fndecl) = 1;
} }
/* Make the insns and PARM_DECLs of the current function permanent /* Make the insns and PARM_DECLs of the current function permanent
...@@ -1745,7 +1745,7 @@ integrate_decl_tree (let, level, map) ...@@ -1745,7 +1745,7 @@ integrate_decl_tree (let, level, map)
} }
else if (DECL_RTL (t)) else if (DECL_RTL (t))
DECL_RTL (d) = copy_rtx (DECL_RTL (t)); DECL_RTL (d) = copy_rtx (DECL_RTL (t));
TREE_EXTERNAL (d) = TREE_EXTERNAL (t); DECL_EXTERNAL (d) = DECL_EXTERNAL (t);
TREE_STATIC (d) = TREE_STATIC (t); TREE_STATIC (d) = TREE_STATIC (t);
TREE_PUBLIC (d) = TREE_PUBLIC (t); TREE_PUBLIC (d) = TREE_PUBLIC (t);
TREE_CONSTANT (d) = TREE_CONSTANT (t); TREE_CONSTANT (d) = TREE_CONSTANT (t);
......
...@@ -317,13 +317,13 @@ print_node (file, prefix, node, indent) ...@@ -317,13 +317,13 @@ print_node (file, prefix, node, indent)
case 'd': case 'd':
mode = DECL_MODE (node); mode = DECL_MODE (node);
if (TREE_EXTERNAL (node)) if (DECL_EXTERNAL (node))
fputs (" external", file); fputs (" external", file);
if (TREE_NONLOCAL (node)) if (DECL_NONLOCAL (node))
fputs (" nonlocal", file); fputs (" nonlocal", file);
if (TREE_REGDECL (node)) if (DECL_REGISTER (node))
fputs (" regdecl", file); fputs (" regdecl", file);
if (TREE_INLINE (node)) if (DECL_INLINE (node))
fputs (" inline", file); fputs (" inline", file);
if (DECL_BIT_FIELD (node)) if (DECL_BIT_FIELD (node))
fputs (" bit-field", file); fputs (" bit-field", file);
...@@ -359,7 +359,7 @@ print_node (file, prefix, node, indent) ...@@ -359,7 +359,7 @@ print_node (file, prefix, node, indent)
indent_to (file, indent + 3); indent_to (file, indent + 3);
if (TREE_CODE (node) != FUNCTION_DECL) if (TREE_CODE (node) != FUNCTION_DECL)
fprintf (file, " align %d", DECL_ALIGN (node)); fprintf (file, " align %d", DECL_ALIGN (node));
else if (TREE_INLINE (node)) else if (DECL_INLINE (node))
fprintf (file, " frame_size %d", DECL_FRAME_SIZE (node)); fprintf (file, " frame_size %d", DECL_FRAME_SIZE (node));
else if (DECL_BUILT_IN (node)) else if (DECL_BUILT_IN (node))
fprintf (file, " built-in code %d", DECL_FUNCTION_CODE (node)); fprintf (file, " built-in code %d", DECL_FUNCTION_CODE (node));
......
...@@ -616,7 +616,7 @@ sdbout_symbol (decl, local) ...@@ -616,7 +616,7 @@ sdbout_symbol (decl, local)
context = decl_function_context (decl); context = decl_function_context (decl);
if (context == current_function_decl) if (context == current_function_decl)
return; return;
if (TREE_EXTERNAL (decl)) if (DECL_EXTERNAL (decl))
return; return;
if (GET_CODE (DECL_RTL (decl)) != MEM if (GET_CODE (DECL_RTL (decl)) != MEM
|| GET_CODE (XEXP (DECL_RTL (decl), 0)) != SYMBOL_REF) || GET_CODE (XEXP (DECL_RTL (decl), 0)) != SYMBOL_REF)
...@@ -646,7 +646,7 @@ sdbout_symbol (decl, local) ...@@ -646,7 +646,7 @@ sdbout_symbol (decl, local)
case VAR_DECL: case VAR_DECL:
/* Don't mention a variable that is external. /* Don't mention a variable that is external.
Let the file that defines it describe it. */ Let the file that defines it describe it. */
if (TREE_EXTERNAL (decl)) if (DECL_EXTERNAL (decl))
return; return;
/* Ignore __FUNCTION__, etc. */ /* Ignore __FUNCTION__, etc. */
......
...@@ -1703,7 +1703,7 @@ compile_file (name) ...@@ -1703,7 +1703,7 @@ compile_file (name)
&& DECL_INITIAL (decl) != 0 && DECL_INITIAL (decl) != 0
&& (TREE_ADDRESSABLE (decl) && (TREE_ADDRESSABLE (decl)
|| TREE_ADDRESSABLE (DECL_ASSEMBLER_NAME (decl))) || TREE_ADDRESSABLE (DECL_ASSEMBLER_NAME (decl)))
&& ! TREE_EXTERNAL (decl)) && ! DECL_EXTERNAL (decl))
output_inline_function (decl); output_inline_function (decl);
/* Warn about any function /* Warn about any function
...@@ -1716,7 +1716,7 @@ compile_file (name) ...@@ -1716,7 +1716,7 @@ compile_file (name)
|| (DECL_NAME (decl) && TREE_USED (DECL_NAME (decl)))) || (DECL_NAME (decl) && TREE_USED (DECL_NAME (decl))))
&& TREE_CODE (decl) == FUNCTION_DECL && TREE_CODE (decl) == FUNCTION_DECL
&& DECL_INITIAL (decl) == 0 && DECL_INITIAL (decl) == 0
&& TREE_EXTERNAL (decl) && DECL_EXTERNAL (decl)
&& ! TREE_PUBLIC (decl)) && ! TREE_PUBLIC (decl))
warning_with_decl (decl, "`%s' declared `static' but never defined"); warning_with_decl (decl, "`%s' declared `static' but never defined");
/* Warn about static fns or vars defined but not used, /* Warn about static fns or vars defined but not used,
...@@ -1726,10 +1726,10 @@ compile_file (name) ...@@ -1726,10 +1726,10 @@ compile_file (name)
&& (TREE_CODE (decl) == FUNCTION_DECL && (TREE_CODE (decl) == FUNCTION_DECL
|| TREE_CODE (decl) == VAR_DECL) || TREE_CODE (decl) == VAR_DECL)
&& ! DECL_IN_SYSTEM_HEADER (decl) && ! DECL_IN_SYSTEM_HEADER (decl)
&& ! TREE_EXTERNAL (decl) && ! DECL_EXTERNAL (decl)
&& ! TREE_PUBLIC (decl) && ! TREE_PUBLIC (decl)
&& ! TREE_USED (decl) && ! TREE_USED (decl)
&& ! TREE_INLINE (decl) && ! DECL_INLINE (decl)
/* The TREE_USED bit for file-scope decls /* The TREE_USED bit for file-scope decls
is kept in the identifier, to handle multiple is kept in the identifier, to handle multiple
external decls in different scopes. */ external decls in different scopes. */
...@@ -1912,7 +1912,7 @@ rest_of_decl_compilation (decl, asmspec, top_level, at_end) ...@@ -1912,7 +1912,7 @@ rest_of_decl_compilation (decl, asmspec, top_level, at_end)
/* Forward declarations for nested functions are not "external", /* Forward declarations for nested functions are not "external",
but we need to treat them as if they were. */ but we need to treat them as if they were. */
if (TREE_STATIC (decl) || TREE_EXTERNAL (decl) if (TREE_STATIC (decl) || DECL_EXTERNAL (decl)
|| TREE_CODE (decl) == FUNCTION_DECL) || TREE_CODE (decl) == FUNCTION_DECL)
TIMEVAR (varconst_time, TIMEVAR (varconst_time,
{ {
...@@ -1931,7 +1931,7 @@ rest_of_decl_compilation (decl, asmspec, top_level, at_end) ...@@ -1931,7 +1931,7 @@ rest_of_decl_compilation (decl, asmspec, top_level, at_end)
|| DECL_IGNORED_P (decl)))) || DECL_IGNORED_P (decl))))
assemble_variable (decl, top_level, at_end); assemble_variable (decl, top_level, at_end);
}); });
else if (TREE_REGDECL (decl) && asmspec != 0) else if (DECL_REGISTER (decl) && asmspec != 0)
{ {
if (decode_reg_name (asmspec) >= 0) if (decode_reg_name (asmspec) >= 0)
{ {
...@@ -1996,7 +1996,7 @@ rest_of_compilation (decl) ...@@ -1996,7 +1996,7 @@ rest_of_compilation (decl)
if (DECL_SAVED_INSNS (decl) == 0) if (DECL_SAVED_INSNS (decl) == 0)
{ {
int specd = TREE_INLINE (decl); int specd = DECL_INLINE (decl);
char *lose; char *lose;
/* If requested, consider whether to make this function inline. */ /* If requested, consider whether to make this function inline. */
...@@ -2008,10 +2008,10 @@ rest_of_compilation (decl) ...@@ -2008,10 +2008,10 @@ rest_of_compilation (decl)
{ {
if (warn_inline && specd) if (warn_inline && specd)
warning_with_decl (decl, lose); warning_with_decl (decl, lose);
TREE_INLINE (decl) = 0; DECL_INLINE (decl) = 0;
} }
else else
TREE_INLINE (decl) = 1; DECL_INLINE (decl) = 1;
}); });
insns = get_insns (); insns = get_insns ();
...@@ -2034,10 +2034,10 @@ rest_of_compilation (decl) ...@@ -2034,10 +2034,10 @@ rest_of_compilation (decl)
finish_compilation will call rest_of_compilation again finish_compilation will call rest_of_compilation again
for those functions that need to be output. */ for those functions that need to be output. */
if (TREE_INLINE (decl) if (DECL_INLINE (decl)
&& ((! TREE_PUBLIC (decl) && ! TREE_ADDRESSABLE (decl) && ((! TREE_PUBLIC (decl) && ! TREE_ADDRESSABLE (decl)
&& ! flag_keep_inline_functions) && ! flag_keep_inline_functions)
|| TREE_EXTERNAL (decl))) || DECL_EXTERNAL (decl)))
{ {
TIMEVAR (integration_time, save_for_inline_nocopy (decl)); TIMEVAR (integration_time, save_for_inline_nocopy (decl));
goto exit_rest_of_compilation; goto exit_rest_of_compilation;
...@@ -2045,7 +2045,7 @@ rest_of_compilation (decl) ...@@ -2045,7 +2045,7 @@ rest_of_compilation (decl)
/* If we have to compile the function now, save its rtl and subdecls /* If we have to compile the function now, save its rtl and subdecls
so that its compilation will not affect what others get. */ so that its compilation will not affect what others get. */
if (TREE_INLINE (decl)) if (DECL_INLINE (decl))
{ {
saved_block_tree = DECL_INITIAL (decl); saved_block_tree = DECL_INITIAL (decl);
saved_arguments = DECL_ARGUMENTS (decl); saved_arguments = DECL_ARGUMENTS (decl);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment