From: Dmitry Antipov Date: Mon, 14 Jan 2013 11:07:50 +0000 (+0400) Subject: Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. X-Git-Tag: emacs-24.3.90~173^2~7^2~303 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9d5a1260b69af8ccb708a3e29b85aa1bf59f8405;p=emacs.git Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. * eval.c (eval_sub): Protect `form' from being GCed before its car and cdr becomes protected with the backtrace entry. --- diff --git a/src/ChangeLog b/src/ChangeLog index 098d3ae027e..2445027edd5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-01-14 Dmitry Antipov + + Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE. + * eval.c (eval_sub): Protect `form' from being GCed before its + car and cdr becomes protected with the backtrace entry. + 2013-01-14 Dmitry Antipov Make Lisp_Save_Value more versatile storage for up to four objects. diff --git a/src/eval.c b/src/eval.c index c49f8e85c2f..030bf14bcea 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1931,7 +1931,10 @@ eval_sub (Lisp_Object form) return form; QUIT; + + GCPRO1 (form); maybe_gc (); + UNGCPRO; if (++lisp_eval_depth > max_lisp_eval_depth) {