re PR debug/37020 (FAIL: gcc.dg/debug/dwarf2/dwarf-die3.c scan-assembler-not DW_AT_in...

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

From-SVN: r141253

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e1026ec188e0374660b65908ab9878071a83ffc..de16de058fe4f1ab3387ed441ba12ea1185675fa 100644 (file)
--- 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 ee8e45e1c0852d99e67378b3a9ad1fff20426549..eba616199b64d9056db5b08230858f83ed644d8a 100644 (file)
--- 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