diff options
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 48 |
1 files changed, 11 insertions, 37 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index d52e0c6e202..5206d202bab 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -616,7 +616,8 @@ remap_decls (tree decls, vec<tree, va_gc> **nonlocalized_list, /* We need to add this variable to the local decls as otherwise nothing else will do so. */ if (TREE_CODE (old_var) == VAR_DECL - && ! DECL_EXTERNAL (old_var)) + && ! DECL_EXTERNAL (old_var) + && cfun) add_local_decl (cfun, old_var); if ((!optimize || debug_info_level > DINFO_LEVEL_TERSE) && !DECL_IGNORED_P (old_var) @@ -3504,33 +3505,13 @@ declare_return_variable (copy_body_data *id, tree return_slot, tree modify_dest, return use; } -/* Callback through walk_tree. Determine if a DECL_INITIAL makes reference - to a local label. */ - -static tree -has_label_address_in_static_1 (tree *nodep, int *walk_subtrees, void *fnp) -{ - tree node = *nodep; - tree fn = (tree) fnp; - - if (TREE_CODE (node) == LABEL_DECL && DECL_CONTEXT (node) == fn) - return node; - - if (TYPE_P (node)) - *walk_subtrees = 0; - - return NULL_TREE; -} - /* Determine if the function can be copied. If so return NULL. If not return a string describng the reason for failure. */ const char * -copy_forbidden (struct function *fun, tree fndecl) +copy_forbidden (struct function *fun) { const char *reason = fun->cannot_be_copied_reason; - tree decl; - unsigned ix; /* Only examine the function once. */ if (fun->cannot_be_copied_set) @@ -3549,19 +3530,12 @@ copy_forbidden (struct function *fun, tree fndecl) goto fail; } - FOR_EACH_LOCAL_DECL (fun, ix, decl) - if (TREE_CODE (decl) == VAR_DECL - && TREE_STATIC (decl) - && !DECL_EXTERNAL (decl) - && DECL_INITIAL (decl) - && walk_tree_without_duplicates (&DECL_INITIAL (decl), - has_label_address_in_static_1, - fndecl)) - { - reason = G_("function %q+F can never be copied because it saves " - "address of local label in a static variable"); - goto fail; - } + if (fun->has_forced_label_in_static) + { + reason = G_("function %q+F can never be copied because it saves " + "address of local label in a static variable"); + goto fail; + } fail: fun->cannot_be_copied_reason = reason; @@ -3705,7 +3679,7 @@ inline_forbidden_p (tree fndecl) bool forbidden_p = false; /* First check for shared reasons not to copy the code. */ - inline_forbidden_reason = copy_forbidden (fun, fndecl); + inline_forbidden_reason = copy_forbidden (fun); if (inline_forbidden_reason != NULL) return true; @@ -5552,7 +5526,7 @@ bool tree_versionable_function_p (tree fndecl) { return (!lookup_attribute ("noclone", DECL_ATTRIBUTES (fndecl)) - && copy_forbidden (DECL_STRUCT_FUNCTION (fndecl), fndecl) == NULL); + && copy_forbidden (DECL_STRUCT_FUNCTION (fndecl)) == NULL); } /* Delete all unreachable basic blocks and update callgraph. |