From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 20 Oct 2008 22:59:13 +0000 (+0000)
Subject: 	PR debug/37020
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bef7f001d7e98da9f9442bb7de455b64c2f4b181;p=thirdparty%2Fgcc.git

	PR debug/37020
	* c-decl.c (merge_decls): Don't call outlining_inline_function hook.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e1026ec188e..de16de058fe4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -6,6 +6,9 @@
 	* gimplify.c (gimplify_expr): Drop TREE_OVERFLOW from
 	INTEGER_CSTs.
 
+	PR debug/37020
+	* c-decl.c (merge_decls): Don't call outlining_inline_function hook.
+
 2008-10-20  Daniel Berlin  <dberlin@dberlin.org>
 
 	* tree-ssa-pre.c (insert_into_preds_of_block): Don't rewrite constant
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index ee8e45e1c085..eba616199b64 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -1775,17 +1775,8 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
 	 throw it away, in case it was inlined into a function that
 	 hasn't been written out yet.  */
       if (new_is_definition && DECL_INITIAL (olddecl))
-	{
-	  if (TREE_USED (olddecl)
-	      /* We never inline re-defined extern inline functions.
-		 FIXME: This would be better handled by keeping both functions
-		 as separate declarations.  */
-	      && cgraph_function_possibly_inlined_p (olddecl))
-	    (*debug_hooks->outlining_inline_function) (olddecl);
-
-	  /* The new defn must not be inline.  */
-	  DECL_UNINLINABLE (newdecl) = 1;
-	}
+	/* The new defn must not be inline.  */
+	DECL_UNINLINABLE (newdecl) = 1;
       else
 	{
 	  /* If either decl says `inline', this fn is inline, unless