From 99ceae26e85dbb4e5034eed29d46c745581d19e8 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sat, 18 Oct 2003 22:32:57 +0200 Subject: [PATCH] * integrate.c (copy_decl_for_inlining): Revert previous patch. From-SVN: r72653 --- gcc/ChangeLog | 4 ++++ gcc/integrate.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) 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 + + * integrate.c (copy_decl_for_inlining): Revert previous patch. + 2003-10-18 Jan Hubicka * 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))