From: Jan Hubicka <jh@suse.cz>
Date: Sat, 18 Oct 2003 20:32:57 +0000 (+0200)
Subject: * integrate.c (copy_decl_for_inlining): Revert previous patch.
X-Git-Tag: releases/gcc-3.4.0~2913
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99ceae26e85dbb4e5034eed29d46c745581d19e8;p=thirdparty%2Fgcc.git

* integrate.c (copy_decl_for_inlining): Revert previous patch.

From-SVN: r72653
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3f1dc46eeb2..115d2fca051e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -40,6 +40,10 @@
 	* rtlanal.c (loc_mentioned_in_p): Adjust for new rtx_def layout.
 	* gdbinit.in (pi): Likewise.
 
+2003-10-18  Jan Hubicka  <jh@suse.cz>
+
+	* integrate.c (copy_decl_for_inlining): Revert previous patch.
+
 2003-10-18  Jan Hubicka  <jh@suse.cz>
 
 	* integrate.c (copy_decl_for_inlining): Fix copying of copies.
diff --git a/gcc/integrate.c b/gcc/integrate.c
index 37a73265e6a4..fa5d71efa000 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -381,10 +381,7 @@ copy_decl_for_inlining (tree decl, tree from_fn, tree to_fn)
 
   /* Set the DECL_ABSTRACT_ORIGIN so the debugging routines know what
      declaration inspired this copy.  */
-  if (DECL_ABSTRACT_ORIGIN (decl))
-    DECL_ABSTRACT_ORIGIN (copy) = DECL_ABSTRACT_ORIGIN (decl);
-  else
-    DECL_ABSTRACT_ORIGIN (copy) = DECL_ORIGIN (decl);
+  DECL_ABSTRACT_ORIGIN (copy) = DECL_ORIGIN (decl);
 
   /* The new variable/label has no RTL, yet.  */
   if (!TREE_STATIC (copy) && !DECL_EXTERNAL (copy))