From: Richard Guenther Date: Fri, 1 Oct 2010 10:45:40 +0000 (+0000) Subject: dwarf2out.c (gen_namespace_die): Use DECL_FILE_SCOPE_P. X-Git-Tag: releases/gcc-4.6.0~3956 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29aca1e1a95a8af77413facab63c2182566a4583;p=thirdparty%2Fgcc.git dwarf2out.c (gen_namespace_die): Use DECL_FILE_SCOPE_P. 2010-10-01 Richard Guenther * dwarf2out.c (gen_namespace_die): Use DECL_FILE_SCOPE_P. (gen_decl_die): Likewise. From-SVN: r164874 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d2f6bf3af0cb..9708bac2fbf6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-01 Richard Guenther + + * dwarf2out.c (gen_namespace_die): Use DECL_FILE_SCOPE_P. + (gen_decl_die): Likewise. + 2010-10-01 Ulrich Weigand * config/spu/spu.c (spu_init_builtins): No longer add END_BUILTINS diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 9136eaa6b916..af5f80906950 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -20620,7 +20620,7 @@ gen_namespace_die (tree decl, dw_die_ref context_die) dw_die_ref origin_die = force_decl_die (DECL_ABSTRACT_ORIGIN (decl)); - if (DECL_CONTEXT (decl) == NULL_TREE + if (DECL_FILE_SCOPE_P (decl) || TREE_CODE (DECL_CONTEXT (decl)) == NAMESPACE_DECL) context_die = setup_namespace_context (decl, comp_unit_die ()); /* Now create the namespace alias DIE. */ @@ -20670,7 +20670,7 @@ gen_decl_die (tree decl, tree origin, dw_die_ref context_die) /* Don't output any DIEs to represent mere function declarations, unless they are class members or explicit block externs. */ if (DECL_INITIAL (decl_or_origin) == NULL_TREE - && DECL_CONTEXT (decl_or_origin) == NULL_TREE + && DECL_FILE_SCOPE_P (decl_or_origin) && (current_function_decl == NULL_TREE || DECL_ARTIFICIAL (decl_or_origin))) break;