From 500b9ca10d50d9d810cc7d712761fa0c295c2ff9 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 21 Oct 2008 00:59:13 +0200 Subject: [PATCH] re PR debug/37020 (FAIL: gcc.dg/debug/dwarf2/dwarf-die3.c scan-assembler-not DW_AT_inline) PR debug/37020 * c-decl.c (merge_decls): Don't call outlining_inline_function hook. From-SVN: r141253 --- gcc/ChangeLog | 3 +++ gcc/c-decl.c | 13 ++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e1026e..de16de0 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 * 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 ee8e45e..eba6161 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 -- 2.7.4