diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-24 13:21:30 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-24 13:21:30 +0000 |
| commit | 262b29f2ac37d2dad47987b4fd19a2f21df19f87 (patch) | |
| tree | 900072c0be45209de4c62493ca2c3e567bc209d5 /gcc/langhooks.c | |
| parent | 665488684c79178ebed91229f7637541361b5368 (diff) | |
| download | gcc-262b29f2ac37d2dad47987b4fd19a2f21df19f87.tar.gz | |
2010-09-24 Richard Guenther <rguenther@suse.de>
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164591 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/langhooks.c')
| -rw-r--r-- | gcc/langhooks.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |