tree.c (cp_cannot_inline_tree_fn): Don't short-circuit test after template instantiation.

        * tree.c (cp_cannot_inline_tree_fn): Don't short-circuit test
        after template instantiation.
	* g++.dg/opt/inline3.C: New.

From-SVN: r54689

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d87e6c7c0d5933435dabfbaf66b72055a8b1ea86..20fbb8f574d642a840a13b4f9994335ef5443773 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-16  Richard Henderson  <rth@redhat.com>
+
+       PR opt/6793
+       * tree.c (cp_cannot_inline_tree_fn): Don't short-circuit test
+       after template instantiation.
+
 2002-06-07  H.J. Lu  (hjl@gnu.org)
 
        * decl2.c (flag_use_cxa_atexit): Set to DEFAULT_USE_CXA_ATEXIT.
@@ -212,12 +218,12 @@
 
 2002-04-11  Andrew Haley  <aph@redhat.com>
 
-        * typeck.c (type_after_usual_arithmetic_conversions):
-        If two types have the same variant, return immediately.
-        When two floating-point operands are the same precision: 
-          convert to float if one of the operands is float;
-          if neither operand is one of the standard types, return the type
-          of the first operand.
+       * typeck.c (type_after_usual_arithmetic_conversions):
+       If two types have the same variant, return immediately.
+       When two floating-point operands are the same precision: 
+         convert to float if one of the operands is float;
+         if neither operand is one of the standard types, return the type
+         of the first operand.
  
 2002-04-12  Richard Sandiford  <rsandifo@redhat.com>
 

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index a614bc1ee358b232c14a66aca5e72f22f6a2914d..98f897346bbbd9bcfaeb7700fb6ff4f8f097d32f 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2168,7 +2168,8 @@ cp_cannot_inline_tree_fn (fnp)
       && TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (fn)))
     {
       fn = *fnp = instantiate_decl (fn, /*defer_ok=*/0);
-      return TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (fn));
+      if (TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (fn)))
+       return 1;
     }
 
   if (varargs_function_p (fn))