aboutsummaryrefslogtreecommitdiff
path: root/gcc/c-decl.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/c-decl.c')
-rw-r--r--gcc/c-decl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 38c1581..18ad119 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1764,8 +1764,7 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
|| !DECL_EXTERNAL (olddecl))
&& DECL_EXTERNAL (newdecl)
&& !lookup_attribute ("gnu_inline", DECL_ATTRIBUTES (newdecl))
- && (DECL_CONTEXT (newdecl) == NULL_TREE
- || TREE_CODE (DECL_CONTEXT (newdecl)) != FUNCTION_DECL))
+ && !current_function_decl)
DECL_EXTERNAL (newdecl) = 0;
if (DECL_EXTERNAL (newdecl))