dwarf2out.c (gen_namespace_die): Use DECL_FILE_SCOPE_P.

2010-10-01  Richard Guenther  <rguenther@suse.de>

	* 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 d2f6bf3af0cbdfff43db16a974625cae5f523ba2..9708bac2fbf6da255ca9548a68fc45944c37c7a7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Richard Guenther  <rguenther@suse.de>
+
+       * dwarf2out.c (gen_namespace_die): Use DECL_FILE_SCOPE_P.
+       (gen_decl_die): Likewise.
+
 2010-10-01  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * config/spu/spu.c (spu_init_builtins): No longer add END_BUILTINS

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 9136eaa6b916b74e4f68941d9aeec3f0aa125af7..af5f80906950c45c8734e726a52896ea0bd53280 100644 (file)
--- 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;