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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72653 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3f1dc4..115d2fc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -42,6 +42,10 @@
 
 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.
 
 2003-10-18  Roger Sayle  <roger@eyesopen.com>

diff --git a/gcc/integrate.c b/gcc/integrate.c
index 37a7326..fa5d71e 100644 (file)
--- 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))