diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c898181a7e..03a8ed9bb53 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 16 02:56:25 1999  Zack Weinberg  <zack@bitmover.com>
+
+	* tree.h (DECL_FROM_INLINE): Check DECL_ABSTRACT_ORIGIN too.
+
 Thu Dec 16 10:43:35 MET 1999  Jan Hubicka  <hubicka@freesoft.cz>
 
 	* i386.md (movqi): Use "nonimmediate_operand" for output operand.
diff --git a/gcc/tree.h b/gcc/tree.h
index 7b0653c343c..4108042114c 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1165,8 +1165,11 @@ struct tree_type
 
 /* Nonzero for any sort of ..._DECL node means this decl node represents
    an inline instance of some original (abstract) decl from an inline function;
-   suppress any warnings about shadowing some other variable.  */
-#define DECL_FROM_INLINE(NODE) (DECL_ABSTRACT_ORIGIN (NODE) != (tree) 0)
+   suppress any warnings about shadowing some other variable.
+   FUNCTION_DECL nodes can also have their abstract origin set to themselves
+   (see save_for_inline_copying).  */
+#define DECL_FROM_INLINE(NODE) (DECL_ABSTRACT_ORIGIN (NODE) != (tree) 0 \
+				&& DECL_ABSTRACT_ORIGIN (NODE) != (NODE))
 
 /* Nonzero if a _DECL means that the name of this decl should be ignored
    for symbolic debug purposes.  */