From 116f30c3fe6af8ea6211f5cf8e0ac3b67fee1f18 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 24 Sep 2010 13:21:30 +0000 Subject: c-decl.c (pop_scope): Always set file-scope DECL_CONTEXT. 2010-09-24 Richard Guenther * c-decl.c (pop_scope): Always set file-scope DECL_CONTEXT. Make sure to not call set_type_context with error_mark_node. * langhooks.c (lhd_set_decl_assembler_name): Use DECL_FILE_SCOPE_P. * gcc.dg/lto/20091006-2_0.c: Prune warnings. From-SVN: r164591 --- gcc/langhooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gcc/langhooks.c') diff --git a/gcc/langhooks.c b/gcc/langhooks.c index 7a585085ef0..ce7522b1585 100644 --- a/gcc/langhooks.c +++ b/gcc/langhooks.c @@ -176,7 +176,7 @@ lhd_set_decl_assembler_name (tree decl) is less than the whole compilation. Concatenate a distinguishing number - we use the DECL_UID. */ - if (TREE_PUBLIC (decl) || DECL_CONTEXT (decl) == NULL_TREE) + if (TREE_PUBLIC (decl) || DECL_FILE_SCOPE_P (decl)) id = targetm.mangle_decl_assembler_name (decl, DECL_NAME (decl)); else { -- cgit v1.2.3