git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

c-decl.c (pop_scope): Always set file-scope DECL_CONTEXT. 

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.

From-SVN: r164591
This commit is contained in:
Richard Guenther 2010-09-24 13:21:30 +00:00 committed by Richard Biener
parent de6ba7aee1
commit 116f30c3fe
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2010-09-24 Richard Guenther <rguenther@suse.de> 2010-09-24 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-onestep): Remove. * Makefile.in (OBJS-onestep): Remove.

13
gcc/c-decl.c
View File

@ -1203,15 +1203,14 @@ pop_scope (void)
DECL_CHAIN (extp) = BLOCK_VARS (block); DECL_CHAIN (extp) = BLOCK_VARS (block);
BLOCK_VARS (block) = extp; BLOCK_VARS (block) = extp;
} }
/* If this is the file scope, and we are processing more /* If this is the file scope set DECL_CONTEXT of each decl to
than one translation unit in this compilation, set the TRANSLATION_UNIT_DECL. This makes same_translation_unit_p
DECL_CONTEXT of each decl to the TRANSLATION_UNIT_DECL. work. */
This makes same_translation_unit_p work, and causes if (scope == file_scope)
static declarations to be given disambiguating suffixes. */
if (scope == file_scope && num_in_fnames > 1)
{ {
DECL_CONTEXT (p) = context; DECL_CONTEXT (p) = context;
if (TREE_CODE (p) == TYPE_DECL) if (TREE_CODE (p) == TYPE_DECL
&& TREE_TYPE (p) != error_mark_node)
set_type_context (TREE_TYPE (p), context); set_type_context (TREE_TYPE (p), context);
} }

2
gcc/langhooks.c
View File

@ -176,7 +176,7 @@ lhd_set_decl_assembler_name (tree decl)
is less than the whole compilation. Concatenate a distinguishing is less than the whole compilation. Concatenate a distinguishing
number - we use the DECL_UID. */ 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)); id = targetm.mangle_decl_assembler_name (decl, DECL_NAME (decl));
else else
{ {

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2010-09-24 Richard Guenther <rguenther@suse.de>
* gcc.dg/lto/20091006-2_0.c: Prune warnings.
2010-09-24 Marcus Shawcroft <marcus.shawcroft@arm.com> 2010-09-24 Marcus Shawcroft <marcus.shawcroft@arm.com>
* g++.dg/debug/dwarf2/nested-2.C: Permit the ARM @ character * g++.dg/debug/dwarf2/nested-2.C: Permit the ARM @ character

1
gcc/testsuite/gcc.dg/lto/20091006-2_0.c
View File

@ -1,4 +1,5 @@
/* { dg-lto-do link } */ /* { dg-lto-do link } */
/* { dg-extra-ld-options "-w" } */
extern int a[10]; extern int a[10];
int main() { return 0; } int main() { return 0; }