merge trunk

1 files changed, 7 insertions, 11 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index acdf809971f..5ac8b4fa2bd 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -423,15 +423,11 @@ unmark_byte_stack (void)
 /* Garbage collect if we have consed enough since the last time.
    We do this at every branch, to avoid loops that never GC.  */
 
-#define MAYBE_GC()                                      \
- do {                                                   \
-  if (consing_since_gc > gc_cons_threshold              \
-      && consing_since_gc > gc_relative_threshold)      \
-    {                                                   \
-      BEFORE_POTENTIAL_GC ();                           \
-      Fgarbage_collect ();                              \
-      AFTER_POTENTIAL_GC ();                            \
-    }                                                   \
+#define MAYBE_GC()              \
+  do {                          \
+   BEFORE_POTENTIAL_GC ();      \
+   maybe_gc ();                 \
+   AFTER_POTENTIAL_GC ();       \
  } while (0)
 
 /* Check for jumping out of range.  */
@@ -540,7 +536,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
   stack.byte_string = bytestr;
   stack.pc = stack.byte_string_start = SDATA (bytestr);
   stack.constants = vector;
-  if (MAX_ALLOCA / sizeof (Lisp_Object) <= XFASTINT (maxdepth))
+  if (MAX_ALLOCA / word_size <= XFASTINT (maxdepth))
     memory_full (SIZE_MAX);
   top = alloca ((XFASTINT (maxdepth) + 1) * sizeof *top);
 #if BYTE_MAINTAIN_TOP
@@ -822,7 +818,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
                 && !EQ (val, Qunbound)
                 && !XSYMBOL (sym)->redirect
                 && !SYMBOL_CONSTANT_P (sym))
-              XSYMBOL (sym)->val.value = val;
+              SET_SYMBOL_VAL (XSYMBOL (sym), val);
             else
               {
                 BEFORE_POTENTIAL_GC ();