This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / gnu / usr.bin / cc / cc1plus / cp-decl.c

diff --git a/gnu/usr.bin/cc/cc1plus/cp-decl.c b/gnu/usr.bin/cc/cc1plus/cp-decl.c
index 7cc3283..b888baa 100644 (file)
--- a/gnu/usr.bin/cc/cc1plus/cp-decl.c
+++ b/gnu/usr.bin/cc/cc1plus/cp-decl.c
@@ -9794,7 +9794,11 @@ start_function (declspecs, declarator, raises, pre_parsed_p)
       if (!ctype && DECL_FRIEND_P (decl1))
        {
          ctype = TREE_TYPE (TREE_CHAIN (decl1));
       if (!ctype && DECL_FRIEND_P (decl1))
        {
          ctype = TREE_TYPE (TREE_CHAIN (decl1));

-         if (TREE_CODE (ctype) != RECORD_TYPE)
+
+         /* CTYPE could be null here if we're dealing with a template;
+            for example, `inline friend float foo()' inside a template
+            will have no CTYPE set.  */
+         if (ctype && TREE_CODE (ctype) != RECORD_TYPE)

            ctype = NULL_TREE;
          else
            doing_friend = 1;
            ctype = NULL_TREE;
          else
            doing_friend = 1;


@@ -10854,13 +10858,6 @@ finish_function (lineno, call_poplevel)
       poplevel (0, 0, 0);
     }
 
       poplevel (0, 0, 0);
     }
 

-  /* Must mark the RESULT_DECL as being in this function.  */
-  DECL_CONTEXT (DECL_RESULT (fndecl)) = DECL_INITIAL (fndecl);
-
-  /* Obey `register' declarations if `setjmp' is called in this fn.  */
-  if (flag_traditional && current_function_calls_setjmp)
-    setjmp_protect (DECL_INITIAL (fndecl));
-

   if (cleanup_label)
     /* Emit label at beginning of cleanup code for parameters.  */
     emit_label (cleanup_label);
   if (cleanup_label)
     /* Emit label at beginning of cleanup code for parameters.  */
     emit_label (cleanup_label);


@@ -10927,6 +10924,13 @@ finish_function (lineno, call_poplevel)
     my_friendly_abort (122);
   poplevel (1, 0, 1);
 
     my_friendly_abort (122);
   poplevel (1, 0, 1);
 

+  /* Must mark the RESULT_DECL as being in this function.  */
+  DECL_CONTEXT (DECL_RESULT (fndecl)) = DECL_INITIAL (fndecl);
+
+  /* Obey `register' declarations if `setjmp' is called in this fn.  */
+  if (flag_traditional && current_function_calls_setjmp)
+    setjmp_protect (DECL_INITIAL (fndecl));
+

   /* Set the BLOCK_SUPERCONTEXT of the outermost function scope to point
      to the FUNCTION_DECL node itself.  */
   BLOCK_SUPERCONTEXT (DECL_INITIAL (fndecl)) = fndecl;
   /* Set the BLOCK_SUPERCONTEXT of the outermost function scope to point
      to the FUNCTION_DECL node itself.  */
   BLOCK_SUPERCONTEXT (DECL_INITIAL (fndecl)) = fndecl;