diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d6264c1..2ec6190 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-03-06 Jason Merrill <jason@redhat.com> + + * tree-inline.c (inlinable_function_p): Revert earlier change + pending investigation. + 2003-03-06 Kazu Hirata <kazu@cs.umass.edu> * config/h8300/h8300.md (a new peephole2): New. diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 77b7baf..e1fab06 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -952,11 +952,6 @@ inlinable_function_p (fn, id) if (DECL_UNINLINABLE (fn)) return 0; - /* Check this now so that we instantiate C++ templates before reading - DECL_NUM_STMTS. */ - if ((*lang_hooks.tree_inlining.cannot_inline_tree_fn) (&fn)) - return 0; - /* Assume it is not inlinable. */ inlinable = 0; @@ -1037,6 +1032,9 @@ inlinable_function_p (fn, id) } } + if (inlinable && (*lang_hooks.tree_inlining.cannot_inline_tree_fn) (&fn)) + inlinable = 0; + /* If we don't have the function body available, we can't inline it. */ if (! DECL_SAVED_TREE (fn)) |