aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2000-08-25 17:52:44 -0400
committerJason Merrill <jason@gcc.gnu.org>2000-08-25 17:52:44 -0400
commitecff20d49e0f694936d291998a8c60384d952d81 (patch)
tree65c00970bb18266f362eece57ca0da1797d4b060
parentd51ff7cb78e8de31e871d19aaa9990eb2e881969 (diff)
downloadgcc-ecff20d49e0f694936d291998a8c60384d952d81.zip
gcc-ecff20d49e0f694936d291998a8c60384d952d81.tar.gz
gcc-ecff20d49e0f694936d291998a8c60384d952d81.tar.bz2
* integrate.c (expand_inline_function): Pull out the original decl.
From-SVN: r35993
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/integrate.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6424cae..7a53d4f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-25 Jason Merrill <jason@redhat.com>
+
+ * integrate.c (expand_inline_function): Pull out the original decl.
+
2000-08-25 Jim Wilson <wilson@cygnus.com>
* cse.c (cse_insn): Don't pass label subtraction to force_const_mem.
diff --git a/gcc/integrate.c b/gcc/integrate.c
index 2cf8813..ca5483a 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -653,6 +653,10 @@ expand_inline_function (fndecl, parms, target, ignore, type,
if (max_regno < FIRST_PSEUDO_REGISTER)
abort ();
+ /* Pull out the decl for the function definition; fndecl may be a
+ local declaration, which would break DECL_ABSTRACT_ORIGIN. */
+ fndecl = inl_f->decl;
+
nargs = list_length (DECL_ARGUMENTS (fndecl));
if (cfun->preferred_stack_boundary < inl_f->preferred_stack_boundary)