From 216d5cdd139f96ada2303beb77b8174e27fddcd5 Mon Sep 17 00:00:00 2001 From: Richard Stallman Date: Sun, 12 Jul 1992 02:43:19 +0000 Subject: [PATCH] *** empty log message *** From-SVN: r1566 --- gcc/calls.c | 2 +- gcc/integrate.c | 10 +++++----- gcc/print-tree.c | 10 +++++----- gcc/sdbout.c | 4 ++-- gcc/toplev.c | 24 ++++++++++++------------ 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gcc/calls.c b/gcc/calls.c index 0836855f17a..b6de19b97de 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -526,7 +526,7 @@ expand_call (exp, target, ignore) Use abstraction instead of setting TREE_ADDRESSABLE 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"); mark_addressable (fndecl); } diff --git a/gcc/integrate.c b/gcc/integrate.c index a6ef3648efd..e1f3a9fe242 100644 --- a/gcc/integrate.c +++ b/gcc/integrate.c @@ -113,14 +113,14 @@ function_cannot_inline_p (fndecl) return "nested function cannot be inline"; /* 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"; #if 0 /* Large stacks are OK now that inlined functions can share them. */ /* Don't inline functions with large stack usage, 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"; #endif @@ -150,7 +150,7 @@ function_cannot_inline_p (fndecl) if (int_size_in_bytes (TREE_TYPE (parms)) < 0) 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; insn = NEXT_INSN (insn)) @@ -328,7 +328,7 @@ finish_inline (fndecl, head) FIRST_PARM_INSN (head) = get_insns (); DECL_SAVED_INSNS (fndecl) = head; 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 @@ -1745,7 +1745,7 @@ integrate_decl_tree (let, level, map) } else if (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_PUBLIC (d) = TREE_PUBLIC (t); TREE_CONSTANT (d) = TREE_CONSTANT (t); diff --git a/gcc/print-tree.c b/gcc/print-tree.c index b7c9e660d23..89abe18a455 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -317,13 +317,13 @@ print_node (file, prefix, node, indent) case 'd': mode = DECL_MODE (node); - if (TREE_EXTERNAL (node)) + if (DECL_EXTERNAL (node)) fputs (" external", file); - if (TREE_NONLOCAL (node)) + if (DECL_NONLOCAL (node)) fputs (" nonlocal", file); - if (TREE_REGDECL (node)) + if (DECL_REGISTER (node)) fputs (" regdecl", file); - if (TREE_INLINE (node)) + if (DECL_INLINE (node)) fputs (" inline", file); if (DECL_BIT_FIELD (node)) fputs (" bit-field", file); @@ -359,7 +359,7 @@ print_node (file, prefix, node, indent) indent_to (file, indent + 3); if (TREE_CODE (node) != FUNCTION_DECL) 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)); else if (DECL_BUILT_IN (node)) fprintf (file, " built-in code %d", DECL_FUNCTION_CODE (node)); diff --git a/gcc/sdbout.c b/gcc/sdbout.c index 3e5a6fff1f2..b95b1c2af98 100644 --- a/gcc/sdbout.c +++ b/gcc/sdbout.c @@ -616,7 +616,7 @@ sdbout_symbol (decl, local) context = decl_function_context (decl); if (context == current_function_decl) return; - if (TREE_EXTERNAL (decl)) + if (DECL_EXTERNAL (decl)) return; if (GET_CODE (DECL_RTL (decl)) != MEM || GET_CODE (XEXP (DECL_RTL (decl), 0)) != SYMBOL_REF) @@ -646,7 +646,7 @@ sdbout_symbol (decl, local) case VAR_DECL: /* Don't mention a variable that is external. Let the file that defines it describe it. */ - if (TREE_EXTERNAL (decl)) + if (DECL_EXTERNAL (decl)) return; /* Ignore __FUNCTION__, etc. */ diff --git a/gcc/toplev.c b/gcc/toplev.c index 6eef84905b2..529f46a94f2 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -1703,7 +1703,7 @@ compile_file (name) && DECL_INITIAL (decl) != 0 && (TREE_ADDRESSABLE (decl) || TREE_ADDRESSABLE (DECL_ASSEMBLER_NAME (decl))) - && ! TREE_EXTERNAL (decl)) + && ! DECL_EXTERNAL (decl)) output_inline_function (decl); /* Warn about any function @@ -1716,7 +1716,7 @@ compile_file (name) || (DECL_NAME (decl) && TREE_USED (DECL_NAME (decl)))) && TREE_CODE (decl) == FUNCTION_DECL && DECL_INITIAL (decl) == 0 - && TREE_EXTERNAL (decl) + && DECL_EXTERNAL (decl) && ! TREE_PUBLIC (decl)) warning_with_decl (decl, "`%s' declared `static' but never defined"); /* Warn about static fns or vars defined but not used, @@ -1726,10 +1726,10 @@ compile_file (name) && (TREE_CODE (decl) == FUNCTION_DECL || TREE_CODE (decl) == VAR_DECL) && ! DECL_IN_SYSTEM_HEADER (decl) - && ! TREE_EXTERNAL (decl) + && ! DECL_EXTERNAL (decl) && ! TREE_PUBLIC (decl) && ! TREE_USED (decl) - && ! TREE_INLINE (decl) + && ! DECL_INLINE (decl) /* The TREE_USED bit for file-scope decls is kept in the identifier, to handle multiple external decls in different scopes. */ @@ -1912,7 +1912,7 @@ rest_of_decl_compilation (decl, asmspec, top_level, at_end) /* Forward declarations for nested functions are not "external", 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) TIMEVAR (varconst_time, { @@ -1931,7 +1931,7 @@ rest_of_decl_compilation (decl, asmspec, top_level, at_end) || DECL_IGNORED_P (decl)))) 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) { @@ -1996,7 +1996,7 @@ rest_of_compilation (decl) if (DECL_SAVED_INSNS (decl) == 0) { - int specd = TREE_INLINE (decl); + int specd = DECL_INLINE (decl); char *lose; /* If requested, consider whether to make this function inline. */ @@ -2008,10 +2008,10 @@ rest_of_compilation (decl) { if (warn_inline && specd) warning_with_decl (decl, lose); - TREE_INLINE (decl) = 0; + DECL_INLINE (decl) = 0; } else - TREE_INLINE (decl) = 1; + DECL_INLINE (decl) = 1; }); insns = get_insns (); @@ -2034,10 +2034,10 @@ rest_of_compilation (decl) finish_compilation will call rest_of_compilation again for those functions that need to be output. */ - if (TREE_INLINE (decl) + if (DECL_INLINE (decl) && ((! TREE_PUBLIC (decl) && ! TREE_ADDRESSABLE (decl) && ! flag_keep_inline_functions) - || TREE_EXTERNAL (decl))) + || DECL_EXTERNAL (decl))) { TIMEVAR (integration_time, save_for_inline_nocopy (decl)); goto exit_rest_of_compilation; @@ -2045,7 +2045,7 @@ rest_of_compilation (decl) /* If we have to compile the function now, save its rtl and subdecls 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_arguments = DECL_ARGUMENTS (decl); -- 2.30.2