Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 2 insertions, 3 deletions

diff --git a/src/eval.c b/src/eval.c
index f9a1a28f004..71b7ac8f84e 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4040,7 +4040,7 @@ mark_specpdl (union specbinding *first, union specbinding *ptr)
           break;
 
         case SPECPDL_UNWIND_ARRAY:
-          mark_maybe_objects (pdl->unwind_array.array, pdl->unwind_array.nelts);
+          mark_objects (pdl->unwind_array.array, pdl->unwind_array.nelts);
           break;
 
         case SPECPDL_UNWIND_EXCURSION:
@@ -4054,8 +4054,7 @@ mark_specpdl (union specbinding *first, union specbinding *ptr)
             mark_object (backtrace_function (pdl));
             if (nargs == UNEVALLED)
               nargs = 1;
-            while (nargs--)
-              mark_object (backtrace_args (pdl)[nargs]);
+            mark_objects (backtrace_args (pdl), nargs);
           }
           break;