diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-20 22:59:13 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-10-20 22:59:13 +0000 |
| commit | bef7f001d7e98da9f9442bb7de455b64c2f4b181 (patch) | |
| tree | 69ae2273b21bfda82dcfcc65ee1f37e620389784 | |
| parent | a34e1c9660188df4cc9b52feed7ecb3e5c8e0a2f (diff) | |
| download | ppe42-gcc-bef7f001d7e98da9f9442bb7de455b64c2f4b181.tar.gz ppe42-gcc-bef7f001d7e98da9f9442bb7de455b64c2f4b181.zip | |
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
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/c-decl.c | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5e1026ec188..de16de058fe 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 ee8e45e1c08..eba616199b6 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 |
