From b11e16d5eacc6bee8aa7ea50be5f2b3f95581b4b Mon Sep 17 00:00:00 2001 From: bstarynk Date: Mon, 19 Dec 2011 09:03:45 +0000 Subject: 2011-12-19 Basile Starynkevitch MELT branch merged with trunk rev 182471 using svnmerge git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@182472 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/dwarf2out.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gcc/dwarf2out.c') diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 768ecaf6669..d5f469c095c 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -18842,8 +18842,9 @@ gen_type_die_with_usage (tree type, dw_die_ref context_die, /* Use the DIE of the containing namespace as the parent DIE of the type description DIE we want to generate. */ - if (DECL_CONTEXT (TYPE_NAME (type)) - && TREE_CODE (DECL_CONTEXT (TYPE_NAME (type))) == NAMESPACE_DECL) + if (DECL_FILE_SCOPE_P (TYPE_NAME (type)) + || (DECL_CONTEXT (TYPE_NAME (type)) + && TREE_CODE (DECL_CONTEXT (TYPE_NAME (type))) == NAMESPACE_DECL)) context_die = get_context_die (DECL_CONTEXT (TYPE_NAME (type))); TREE_ASM_WRITTEN (type) = 1; -- cgit v1.2.1