# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1204578432 0
# Node ID 235b5ef31f41abe1f8880b4dcd3ae82e2a55b100
# Parent  3db1228ead22c0a84d11d26a6dae1c82a1fc3838
(byte-compile-trueconstp, byte-compile-nilconstp): No recursion in defsubst.

diff -r 3db1228ead22 -r 235b5ef31f41 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Mar 03 13:55:41 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 03 21:07:12 2008 +0000
@@ -1,5 +1,8 @@
 2008-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* emacs-lisp/byte-opt.el (byte-compile-trueconstp)
+	(byte-compile-nilconstp): Can't use recursion in a defsubst.
+
 	* textmodes/tex-mode.el (latex-mode): Remove % from paragraph-separate
 	so that M-q can fill comments.
 	(tex-executable-exists-p, tex-compile): Extend with special syntax for
diff -r 3db1228ead22 -r 235b5ef31f41 lisp/emacs-lisp/byte-opt.el
--- a/lisp/emacs-lisp/byte-opt.el	Mon Mar 03 13:55:41 2008 +0000
+++ b/lisp/emacs-lisp/byte-opt.el	Mon Mar 03 21:07:12 2008 +0000
@@ -632,20 +632,28 @@
 
 (defsubst byte-compile-trueconstp (form)
   "Return non-nil if FORM always evaluates to a non-nil value."
+  (while (eq (car-safe form) 'progn)
+    (setq form (car (last (cdr form)))))
   (cond ((consp form)
          (case (car form)
            (quote (cadr form))
-           (progn (byte-compile-trueconstp (car (last (cdr form)))))))
+           ;; Can't use recursion in a defsubst.
+           ;; (progn (byte-compile-trueconstp (car (last (cdr form)))))
+           ))
         ((not (symbolp form)))
         ((eq form t))
         ((keywordp form))))
 
 (defsubst byte-compile-nilconstp (form)
   "Return non-nil if FORM always evaluates to a nil value."
+  (while (eq (car-safe form) 'progn)
+    (setq form (car (last (cdr form)))))
   (cond ((consp form)
          (case (car form)
            (quote (null (cadr form)))
-           (progn (byte-compile-nilconstp (car (last (cdr form)))))))
+           ;; Can't use recursion in a defsubst.
+           ;; (progn (byte-compile-nilconstp (car (last (cdr form)))))
+           ))
         ((not (symbolp form)) nil)
         ((null form))))