upstream

1 files changed, 2 insertions, 2 deletions

diff --git a/src/bytecode.c b/src/bytecode.c
index 523d56bc97b..5ac8b4fa2bd 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -536,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
@@ -818,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))
-              SVAR (XSYMBOL (sym), val.value) = val;
+              SET_SYMBOL_VAL (XSYMBOL (sym), val);
             else
               {
                 BEFORE_POTENTIAL_GC ();