reapply accidentally reverted diff

[Richard Henderson]

Jason, when committing 1.866.2.5,

        * decl.c (make_rtl_for_nonlocal_decl): Also defer COMDAT
        variables.

you accidentally reverted your 2002-02-28 patch.


r~


        * decl.c (finish_function): Reapply accidentally reverted
        2002-02-28 patch.

Index: decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl.c,v
retrieving revision 1.866
retrieving revision 1.867
diff -c -p -d -r1.866 -r1.867
*** decl.c	2002/02/22 11:57:38	1.866
--- decl.c	2002/02/28 13:29:59	1.867
*************** finish_function (flags)
*** 14224,14238 ****
      DECL_UNINLINABLE (fndecl) = 1;
  
    /* Complain if there's just no return statement.  */
!   if (!processing_template_decl
        && TREE_CODE (TREE_TYPE (fntype)) != VOID_TYPE
        && !current_function_returns_value && !current_function_returns_null
-       && !DECL_NAME (DECL_RESULT (fndecl))
        /* Don't complain if we abort or throw.  */
        && !current_function_returns_abnormally
!       /* If we have -Wreturn-type, let flow complain.  Unless we're an
  	 inline function, as we might never be compiled separately.  */
!       && (!warn_return_type || DECL_INLINE (fndecl)))
      warning ("no return statement in function returning non-void");
      
    /* Clear out memory we no longer need.  */
--- 14224,14239 ----
      DECL_UNINLINABLE (fndecl) = 1;
  
    /* Complain if there's just no return statement.  */
!   if (warn_return_type
!       && !processing_template_decl
        && TREE_CODE (TREE_TYPE (fntype)) != VOID_TYPE
        && !current_function_returns_value && !current_function_returns_null
        /* Don't complain if we abort or throw.  */
        && !current_function_returns_abnormally
!       && !DECL_NAME (DECL_RESULT (fndecl))
!       /* Normally, with -Wreturn-type, flow will complain.  Unless we're an
  	 inline function, as we might never be compiled separately.  */
!       && DECL_INLINE (fndecl))
      warning ("no return statement in function returning non-void");
      
    /* Clear out memory we no longer need.  */