diff options
Diffstat (limited to 'gcc/integrate.c')
| -rw-r--r-- | gcc/integrate.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gcc/integrate.c b/gcc/integrate.c index 6746b3f450f..d1be2373fef 100644 --- a/gcc/integrate.c +++ b/gcc/integrate.c @@ -157,11 +157,13 @@ function_cannot_inline_p (fndecl) tree last = tree_last (TYPE_ARG_TYPES (TREE_TYPE (fndecl))); /* For functions marked as inline increase the maximum size to - MAX_INLINE_INSNS (-finline-limit-<n>). For regular functions - use the limit given by INTEGRATE_THRESHOLD. */ + MAX_INLINE_INSNS_RTL (--param max-inline-insn-rtl=<n>). For + regular functions use the limit given by INTEGRATE_THRESHOLD. + Note that the RTL inliner is not used by the languages that use + the tree inliner (C, C++). */ int max_insns = (DECL_INLINE (fndecl)) - ? (MAX_INLINE_INSNS + ? (MAX_INLINE_INSNS_RTL + 8 * list_length (DECL_ARGUMENTS (fndecl))) : INTEGRATE_THRESHOLD (fndecl); @@ -3002,15 +3004,17 @@ set_decl_abstract_flags (decl, setting) from its DECL_SAVED_INSNS. Used for inline functions that are output at end of compilation instead of where they came in the source. */ +static GTY(()) struct function *old_cfun; + void output_inline_function (fndecl) tree fndecl; { - struct function *old_cfun = cfun; enum debug_info_type old_write_symbols = write_symbols; const struct gcc_debug_hooks *const old_debug_hooks = debug_hooks; struct function *f = DECL_SAVED_INSNS (fndecl); + old_cfun = cfun; cfun = f; current_function_decl = fndecl; @@ -3026,6 +3030,11 @@ output_inline_function (fndecl) debug_hooks = &do_nothing_debug_hooks; } + /* Make sure warnings emitted by the optimizers (e.g. control reaches + end of non-void function) is not wildly incorrect. */ + input_filename = DECL_SOURCE_FILE (fndecl); + lineno = DECL_SOURCE_LINE (fndecl); + /* Compile this function all the way down to assembly code. As a side effect this destroys the saved RTL representation, but that's okay, because we don't need to inline this anymore. */ |