From: Jason Merrill <jason@gcc.gnu.org>
Date: Tue, 23 Nov 1999 14:47:08 +0000 (-0500)
Subject: revert AT_containing_type change
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de6e505ec71b678f2b3646b8d1ff51a288c939be;p=gcc.git

revert AT_containing_type change

From-SVN: r30639
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 237bf77d422..21e8547a104 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -53,8 +53,6 @@ Mon Nov 22 22:58:01 1999  "R. Kelley Cook" <KelleyCook@attglobal.net>
 	(reverse_die_lists): New fn.
 	(add_sibling_attributes): Use it.
 	(push_decl_scope): Reorganize.
-	(gen_struct_or_union_type_die): Don't add a DW_AT_containing_type 
-	that points to ourself.
 	(add_name_and_src_coords_attributes): Don't set file and line for
 	an artificial decl.
 	(gen_subprogram_die): An artificial function doesn't need to match
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 884a518dec2..c2926c332cf 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -8935,12 +8935,9 @@ gen_struct_or_union_type_die (type, context_die)
 	{
 	  tree vtype = DECL_FCONTEXT (TYPE_VFIELD (type));
 
-	  if (vtype != type)
-	    {
-	      gen_type_die (vtype, context_die);
-	      add_AT_die_ref (type_die, DW_AT_containing_type,
-			      lookup_type_die (vtype));
-	    }
+	  gen_type_die (vtype, context_die);
+	  add_AT_die_ref (type_die, DW_AT_containing_type,
+			  lookup_type_die (vtype));
 	}
     }
   else