diff --git a/src/mzscheme/src/eval.c b/src/mzscheme/src/eval.c index 2bd76928a2..7a3a8146cf 100644 --- a/src/mzscheme/src/eval.c +++ b/src/mzscheme/src/eval.c @@ -145,6 +145,9 @@ #endif #ifdef FUTURES_ENABLED # include "future.h" +#else +# define LOG_PRIM_START(x) /* empty */ +# define LOG_PRIM_END(x) /* empty */ #endif #define EMBEDDED_DEFINES_START_ANYWHERE 0 @@ -7859,10 +7862,11 @@ scheme_do_eval(Scheme_Object *obj, int num_rands, Scheme_Object **rands, } f = prim->prim_val; - LOG_PRIM_START(f); + LOG_PRIM_START(f); v = f(num_rands, rands, (Scheme_Object *)prim); - LOG_PRIM_END(f); + LOG_PRIM_END(f); + DEBUG_CHECK_TYPE(v); } else if (type == scheme_closure_type) { Scheme_Closure_Data *data; diff --git a/src/mzscheme/src/schnapp.inc b/src/mzscheme/src/schnapp.inc index b798924bed..a12f945453 100644 --- a/src/mzscheme/src/schnapp.inc +++ b/src/mzscheme/src/schnapp.inc @@ -31,9 +31,9 @@ static MZ_INLINE Scheme_Object *PRIM_APPLY_NAME_FAST(Scheme_Object *rator, } f = (Scheme_Primitive_Closure_Proc *)prim->prim_val; - LOG_PRIM_START(f); + LOG_PRIM_START(f); v = f(argc, argv, (Scheme_Object *)prim); - LOG_PRIM_END(f); + LOG_PRIM_END(f); #if PRIM_CHECK_VALUE if (v == SCHEME_TAIL_CALL_WAITING) {