From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 14 Jun 2016 18:46:30 +0000 (-0700)
Subject: Remove recursion from store_function_docstring
X-Git-Tag: emacs-26.0.90~1840^2~230
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f35d5cbaf055dddcf0489a6f6a46df7ddaeeaf4;p=emacs.git

Remove recursion from store_function_docstring

* src/doc.c (store_function_docstring):
Refactor to avoid the need for C-level recursion.
---

diff --git a/src/doc.c b/src/doc.c
index 017dd173d0a..7107580cf8b 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -481,15 +481,10 @@ store_function_docstring (Lisp_Object obj, ptrdiff_t offset)
 
   /* The type determines where the docstring is stored.  */
 
-  /* Lisp_Subrs have a slot for it.  */
-  if (SUBRP (fun))
-    {
-      intptr_t negative_offset = - offset;
-      XSUBR (fun)->doc = (char *) negative_offset;
-    }
-
   /* If it's a lisp form, stick it in the form.  */
-  else if (CONSP (fun))
+  if (CONSP (fun) && EQ (XCAR (fun), Qmacro))
+    fun = XCDR (fun);
+  if (CONSP (fun))
     {
       Lisp_Object tem;
 
@@ -503,8 +498,13 @@ store_function_docstring (Lisp_Object obj, ptrdiff_t offset)
 	       correctness is quite delicate.  */
 	    XSETCAR (tem, make_number (offset));
 	}
-      else if (EQ (tem, Qmacro))
-	store_function_docstring (XCDR (fun), offset);
+    }
+
+  /* Lisp_Subrs have a slot for it.  */
+  else if (SUBRP (fun))
+    {
+      intptr_t negative_offset = - offset;
+      XSUBR (fun)->doc = (char *) negative_offset;
     }
 
   /* Bytecode objects sometimes have slots for it.  */