Mercurial > hg > xemacs-beta
changeset 5394:484b437fc7b4
Correct some nesting of GCPRO and UNGCPRO, thank you Mats' buildbot!
2011-04-04 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (FremoveX):
* fns.c (sublis):
Correct some nesting of GCPRO and UNGCPRO here, revealed by the
the C++ build compiling core Lisp. Thank you Mats' buildbot!
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 04 Apr 2011 09:12:39 +0100 |
| parents | e99b473303e3 |
| children | ccf7e84fe265 |
| files | src/ChangeLog src/fns.c |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Apr 04 00:20:09 2011 +0100 +++ b/src/ChangeLog Mon Apr 04 09:12:39 2011 +0100 @@ -1,3 +1,10 @@ +2011-04-04 Aidan Kehoe <kehoea@parhasard.net> + + * fns.c (FremoveX): + * fns.c (sublis): + Correct some nesting of GCPRO and UNGCPRO here, revealed by the + the C++ build compiling core Lisp. Thank you Mats' buildbot! + 2011-04-04 Aidan Kehoe <kehoea@parhasard.net> * lisp.h (GC_EXTERNAL_LIST_LOOP_3, GC_EXTERNAL_LIST_LOOP_4): New.
--- a/src/fns.c Mon Apr 04 00:20:09 2011 +0100 +++ b/src/fns.c Mon Apr 04 09:12:39 2011 +0100 @@ -3658,6 +3658,7 @@ if (EQ (tail, tailing)) { XUNGCPRO (elt); + UNGCPRO; if (NILP (result)) { @@ -9147,7 +9148,7 @@ if (!CONSP (tree)) { - RETURN_UNGCPRO (tree); + return tree; } aa = sublis (alist, XCAR (tree), check_test, test_not_unboundp, test, key, @@ -9157,10 +9158,10 @@ if (EQ (aa, XCAR (tree)) && EQ (dd, XCDR (tree))) { - RETURN_UNGCPRO (tree); - } - - RETURN_UNGCPRO (Fcons (aa, dd)); + return tree; + } + + return Fcons (aa, dd); } DEFUN ("sublis", Fsublis, 2, MANY, 0, /*