1 files changed, 7 insertions, 5 deletions
diff --git a/vm_core.h b/vm_core.h
index 0701c5c4a9..1b5d8deea3 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -854,11 +854,13 @@ int rb_autoloading_value(VALUE mod, ID id, VALUE* value);
 
 #define sysstack_error GET_VM()->special_exceptions[ruby_error_sysstack]
 
-#define CHECK_VM_STACK_OVERFLOW(cfp, margin) do \
-  if ((VALUE *)((char *)(((VALUE *)(cfp)->sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)(cfp))) { \
-      vm_stackoverflow(); \
-  } \
-while (0)
+#define CHECK_VM_STACK_OVERFLOW0(cfp, sp, margin) do { \
+    if ((VALUE *)((char *)((VALUE *)(sp) + (margin)) + sizeof(rb_control_frame_t)) >= ((VALUE *)(cfp))) { \
+	vm_stackoverflow(); \
+    } \
+} while (0)
+
+#define CHECK_VM_STACK_OVERFLOW(cfp, margin) CHECK_VM_STACK_OVERFLOW0((cfp), (cfp)->sp, margin)
 
 /* for thread */